Reorganized tests directory

This is a bit more structure, but it does better organize related files
in the test suite.