Cleaned up unit tests.