Re-enable some discount tests to test #2302