Working on the tests
Mostly SQLite compat