Simplified some test names