Shuffle methods

Since I ended up needing the `raise` that caused a problem with a test, I marked it pending and the changes here don't cause any additional issues.

@tmertens, what do you think in regards to your comment: https://github.com/centro/puffing-billy/pull/6/files#r8680271 ?