Split into two boxes, enables more tests where openjp2 not present.

Closes #85
Merge branch 'issue85' into devel