Updating testdb settings
Fixing up tests.
WIP