Changes to setup tests on existing db