Tidied up the test names