Improved test infrastructure