Edited and added test methods in ComponentManagerImpl