Made all discount tests passing.