update UnsubscribeTests to handle new exitCode/stdout/stderr changes
from bug 1119688
update ContentTests to handle new exitCode/stdout/stderr changes
from bug 1119688