Upgraded to JUnit 4.11, Mockito 1.9.5
Use JUnit 4.11's improved parameterized test descriptions