Tests improved
test.sql updated
Connector fix