Updated helper methods
Updated tests