Tests: Update test_dbserver_yaml for master changes.
Tests: Update test_database to update for new behavior.
Merge pull request #146 from Astron/fix-dbtests2

Tests: Update test_dbserver_yaml for master changes.