Fixing build after upgrade to powermock 1.5 broke tests