Fixing test after merge hell