Added unit tests for the other helper methods