Fixing test-app for 2.2
Merge pull request #125 from tjdett/2_2-fix-tests

Fixing test-app for 2.2