database -> dataService to fix ValueConverterTest
Merge pull request #949 from bartcharbon/master

fix ValueConverterTest