Added unit test.
Cleanup