Refactored and restructured UI Test App