Tidied tests