Cleans up tests, moves creating DB instance into a helper