Modified test code to use new helpers.