Adds changes to existing test to fix test failures