Fixes to test app to run.