Renaming test files so they're more generic