TEIID-1979: fixing unit tests