Cleaned up testing.