Moved SQLite3 to test
PG added
Changes
Name changes
Scoping