- change class namenames to be consistent with impl/interface naming convention
- make unit tests isolated (ie not depend on results of previous tests)
- use final vars for env and db