Improve mock/mock-plugin cartridges