Made the test app more readable