Adjust test infrastructure