Updated tests to match new databases