Fixing a tiny remaining bug(?) with multinomial sampling, and making the test suite run again.