added some tests
tests tidied up