Tidied up test