Rearrange tests to simplify inclusion in other projects.