Restructure the test suite

[ghost]

Describe the solution you'd like

Some tests in the "Larger tests" set are very similar.
There should be at least one unit test for every function in the package.
The test suite should be re ordered so that similar tests are next to each other.
Any gaps in functionality should be covered by new tests.