Improved tests resetting DB