Aligning some SQL
Updating test data so all schemaValidationSpec test can be run