Cleaned up things in tests.