Code reformat
Upgraded to Mockito 1.9.5

Closes #1