Added code-coverage configuration
Testing passing "shuffling" flag to callback
More idiomatic Option handling