I'm confused by these changes. I'll continue reading in the hope that I understand, but mock objects shouldn't require page objects imo.