And tidied the tests as well