fixes #5
prepare test db
merge conflict from root
fixes #5
removed unecessary log and sqlite3 files
Merge pull request #7 from christiannaths/master

Fixes for #5