Tidied up test.