Updates test to work with new code changes