More refactoring, crazy futuristic test names