Bit by bit, making the mock objects play nice.