tidied unit tests