heavy modification of the test infrastructure