changed unit test file structure