fix database connection
Merge branch 'test'