TRUNK-3944: Updated junit to 4.11 and fixed tests