Fixing error
More fixing
Remove test db
Merge branch 'dev'