Setting up a better test suite