New version of test-app