Cleaned up tests that used the old names