Fix db dump inconsistency and test fixture
Merge pull request #1027 from ezsystems/fix-test-fixtures

Fix DB dump inconsistency and test fixture