Changed test-database layout