the way a bunch of requirements were written.  I also added missing
assert statements to the randomize_samples() functions.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403040