start fixing test broken by the merge with master