yaffs fixed some merge issues in direct/timothy_tests/quick_tests