Fix test case to handle bumping the number of tokens, also randomize somewhat distribution of tokens.