fix failing tests after merge