test suite cleanup; gi3.2 fixes