Formatting in MySQL queries
Update PostgreSQL schemas and queries
We shouldn't explicitly $INCLUDE the main dictionary anymore for tests