So, I drained the tank from the drain plug into a jerry can and put the gas in the Mini. It took about 3 cans to drain the 20L. Everything went fairly smoothly, but took a long time.
Anyway, the tank fit well and Capital Dominion was a pleasure to deal with. +1 for them.