Improve tests
Improve tests
Improve test database layout
Improve tests