Make tests pass cross-platform, reactivate ref #2717
Merge pull request #2808 from bwspenc/j_int

Make tests pass cross-platform, reactivate