Added unit test
Completed unit test