Updates to test code for new gem