fix tests broken by recent CLs