Dry mode and new tests