we now have real tests - no need for mocks of mocks :) 

I know, it has been this way for a bit