Consolidate db connection path
Add tests
Update tasks file