Fixup junit runner tools