Document the reshuffler. Add more tests.