Update Avocado version range to >= 2.1.0 < 2.2
Fix reference to choices.

In Avocado 2.1, choices is now a cached method not a property.