Fix bug from test reorg.