Since this is only used in test code, could we move it to a TestUtil class instead of adding it to a production class?