Remove mock.patch for no longer existing import.  This should fix the failing test.
Adjust test to match new code.
Merge remote-tracking branch 'origin/feature/fix_postgres' into bleeding_edge

* origin/feature/fix_postgres:
  Adjust test to match new code.
  Remove mock.patch for no longer existing import.  This should fix the failing test.