Added container class for System Package configuration.
Minor fix in autowire test.