Fixing name changes, initial postgres tests passing