Added unit tests for helper methods