Tidied up testing