make classes testable.  add basic coverage.