Minor changes to tests
conflict resolved