Poorly named branch.

Nothing mockito was done, but this does have a bit of fixes. It's not like master was buildable yet anyway.