More thrashing to get the test suite to work