Tweak discount amount tests again. #2302