Updated the test suite a little.