tidying up and fixing tests
tidying up and fixing tests