Added unit tests
Updated tests