Fixes for the tests app without the system app.