@Fryguy Should the  specs be checking both :output => data and :exit_status => 0 in the specs where they used to check:
 and_return(CommandResult.new("", data, "", 0)) ?