Fix tests for new behaviour