Re-instated test-psql test-mysql to "make test"