Added ServieManagerFactory and added CliTest