Reorder some tests
Allow type-parameterization of test suites