tidied up more tests