fix ordering in tests
Merge pull request #1104 from ceeram/3.0-database-order

fix ordering in tests