Minor fixes for test app.