Fixed some tests that fails after merge the dev-sqlite branch