Improved test-util stripFields