Make order of divisions in policy deterministic
Remove unused parameter in helper
Revert "Revert "Comment out test that occasionally fails on travis""

This reverts commit a52e340971d8e3ba926b9fbb297ac6650334d13d.