Brings test dependencies up to date

junit to 4.11 and mockito to 1.9.5
Merge pull request #261 from Nycander/fix-junit-dep

Brings test dependencies up to date