Fixes code broken by test changes. Take2