Added unit tests for all the methods