Factor out common test code.
Add a propcache to the mock app.
Getting on with the tests.