Fix tests to run in arbitrary order with newer surefire.

yeah, this stuff *is* a mess...