repair tests after !1207 (merged)
This will create a new commit in order to revert the existing changes.