381 - adding our first test for configuring the db server
Merge remote-tracking branch 'origin/master'