Added DB, tests, code refactored
Merge branch 'added-db-tests-refactored'