Rearrange tests
Update testing