Fixes code broken by test changes