Cleanup test.

This should make it easier to add more tests to this file.