Dependency updates.
Ported a couple generic tests.
Quick IDE reformatting of old code.

- Does the history matter much going forward when everything is being rewritten? I didn't think so.
Merge branch 'reformat' into mockito