fix tests references after merge