Fix test suite breakage