Revert "Changed Test apps"

This reverts commit 529ae31268f94b93a797e7fbb081e6290892eda7.