Cleanup: testApp Code cleanup