Merge pull request #23215 from eileenmcnaughton/test_amount