Added unit tests for methods that were not covered