test tidied up