TEIID-2804 correcting unit tests