Made non-error result into an :ok tuple with result.

fixed tests to reflect new reality