Re-enable discount tests. #2302