fix tests after updating to latest master