Cleaned up a couple last tests.