Existing tests and models adjusted in progress to expect env-specific DBs

- Issue #4