Update test suite
Updating the test suite (and fixing a few things along the way)