Stop using old equalTo<Type> and assertThat<Type> now that Objective-C has boxed values.

Keep using willReturn<Type> for one set of tests, but deemphasize them elsewhere.
Deemphasize willReturn<Type> by moving them down. Remove unneeded typeof().