Adding supoort to run ServiceManagement tests