Fixing test-app for 2.2