Adding work on the CompositeApp and its tests.