Update test dependencies

 * use JUnit 4.11
 * use Hamcrest 1.3
Microfix: remove code duplication
Fix incorrect comparison
Reduce method visibility