Refactor tests into more sensible suites.