fix tests broken by merge with master