DB abstraction; Added ConversionService approach; Corrected unit tests
Cobertura took away