added test db and some functionality
merge conflict