Fixed merge problem
reorganised the files to make it easier to add new tests
merge changes from steph