Added new unit test for new helper methods