Renamed ChannelLauncherTest to ChannelFactoryTest
Tidied up spacing of Singleton.php