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

Make tests pass cross-platform, reactivate
Merge commit '3ba2943f5979ef798007d1a97859a007e2f6fa58'