updates tests ready for extension
renames some files for clarity