updated layout of test directory