Rearrange unit test files