Allow `choose` generator to be swapped
Fix test
Update dependencies

Improved tests a bit while at it.
0.3.0