updated helper functions and tests