Added fixable randomization, and got tests to 99%
Merge origin/master