ERT-601: Minor fallout from test refactor.