Further test suite cleanup