Improved the tests a bit.