Fix tests for new helpers