TEIID-2627 preventing issues with tests