Extending base tests. Fixing bugs in match_sql.
Changing basic conversion to work correctly.