Tidied up the tests some more.