Changes to tests
Rearrange