TEIID-1979: fixing unit tests
Merge pull request #67 from rareddy/TEIID-1929

TEIID-1979: fixing unit tests