Remove redundant test files + tidy up