Fixes for teiid 7 unit tests and refactored unit tests

* All unit tests compile

WIP