Simplified logging guard, updates junit to 4.11 to permit use of Rules