Added replacement of global ComponentRegistry in all related tests