Cleaned up unit test.