Some small test improvements
Completely re-wrote the tests using a nicer harness