Get test suite passing again