Cleaned up test names and locations.