Added dependency to catch-exception 1.0.4
Upgraded to Mockito 1.9.5
Refactored tests to use catchException()
Refactored: use lambda expressions in tests