reorganised the files to make it easier to add new tests