Updating test-app

Merging changes from: b2d468d..a972971