Fixup dependency order for ensure stopped

 * Also adds ensure running with the some behavior as present