All tests pass. Refactor to add local DB and prod DB