Change take clipping algo

Fixes #2754 by basing the take clipping on the nominal amount instead of the actual amount.
I've modified the test to check that the nominal amount is used, not the actual amount from the `transfers` table.