Add a bunch to the test suite, tweaks to make things more streamlined