Rearrange tests for some organizational sanity