Fixed failing tests

To match the new expected behaviour...