tidying
fixing up tests