minor reformat: break long line
add more tests
slight error message rewording
add some (non passing) one-of tests
use bigger sample for test
be smarter about plurals
move a couple methods to package object
add weighted-one-of prim