revert timtec-test makefile changes
Merge branch 'layout'