Minor changes to make test pass