TEIID-3233  Fixed NPE in test integration

This can also be applied to master.