Revert some more junit 3 downgrades