rearrange tests to match structure of project