Complete Rewriting of TestApp Class