Updated test app for matching the new changes