Updated some tests

Changed to make it work with a db that isn't reset on each suite of
tests