Reorganising application component. Some test updates.