Refactor tests to use differently named test files to check travis-ci behaviour