Get test suite passing with legacy disabled