Tested: remove/change mocks of internal classes
Merge branch 'master' of github.com:papayateam/papayacms-core