changing test files structure