Removed unused code
Updated DB tests
Merge pull request #231 from AntonShevchuk/master

Updated DB tests