Remove some unnecessary stubbing from unit tests.