Updates for issue 4, scenario 2 tests running OK