fixing test after last merges