Last change to TestApp. Structure is set for next assignment.