diff --git a/lib/pipeline/runtime/container_run.rb b/lib/pipeline/runtime/container_run.rb
index f390dde..5c2c0a0 100644
--- a/lib/pipeline/runtime/container_run.rb
+++ b/lib/pipeline/runtime/container_run.rb
@@ -38,7 +38,8 @@ module Pipeline::Runtime
         rootfs_source: rootfs_source,
         result: result,
         invocation: @result.report,
-        logs: @logs.inspect
+        logs: @logs.inspect,
+        exit_status: exit_status
       }
     end
 
diff --git a/test/pipeline/rpc/worker/analysis_action_test.rb b/test/pipeline/rpc/worker/analysis_action_test.rb
new file mode 100644
index 0000000..f0b8b5a
--- /dev/null
+++ b/test/pipeline/rpc/worker/analysis_action_test.rb
@@ -0,0 +1,109 @@
+require 'test_helper'
+
+class Pipeline::Rpc::Worker::WorkerActionTest < Minitest::Test
+
+  def setup
+    @credentials = {
+      "access_key_id" => "ACCESS_KEY_ID",
+      "secret_access_key" => "SECRET_KEY",
+      "session_token" => "SESSION",
+    }
+    @request = {
+      "context" => { "credentials" => @credentials },
+      "track_slug" => "demo",
+      "exercise_slug" => "my-exercise",
+      "id" => "my-input-id",
+      "container_version" => "abcdef"
+    }
+    @return_address = "_return_address"
+    @environment = mock()
+    @action = Pipeline::Rpc::Worker::ContainerAction.new(@request, @return_address)
+    @action.environment = @environment
+  end
+
+  def test_prepare_folder_raises
+    error = assert_raises do
+      @action.prepare_folder("/tmp/my_folder")
+    end
+    assert_equal "Please prepare input", error.message
+  end
+
+  def test_setup_container_run
+    error = assert_raises do
+      @action.setup_container_run("/tmp/my_folder", "foo", "bar")
+    end
+    assert_equal "Please create run command", error.message
+  end
+
+  def test_invoke_when_correct_container_is_not_released
+    @environment.expects(:released?).with("demo", "abcdef").returns(false)
+    result = @action.invoke
+    assert_equal 404, result[:status_code]
+    assert_equal "Container demo:abcdef isn't available", result[:error]
+    assert_equal :error_response, result[:msg_type]
+  end
+
+  def test_invoke_when_set_fails
+    @environment.expects(:released?).with("demo", "abcdef").returns(true)
+    @environment.expects(:track_dir).with("demo", "abcdef").returns("/tmp/foobar")
+
+    @action.expects(:setup_container_run).raises("Ouch! Couldn't setup job")
+
+    result = @action.invoke
+    assert_equal 500, result[:status_code]
+    assert_equal "Failure setting up job", result[:error]
+    assert_equal :error_response, result[:msg_type]
+  end
+
+  def test_invoke_when_prepare_iteration_fails
+    @environment.expects(:released?).with("demo", "abcdef").returns(true)
+    @environment.expects(:track_dir).with("demo", "abcdef").returns("/tmp/foobar")
+
+    @stub_job_invoker = mock()
+    @stub_job_invoker.expects(:prepare_iteration).raises("Ouch! Couldn't prepare input")
+    @stub_job_invoker.expects(:analyze!).never
+
+    @action.expects(:setup_container_run).with("/tmp/foobar", "my-exercise", "my-input-id").returns @stub_job_invoker
+
+    result = @action.invoke
+    assert_equal 500, result[:status_code]
+    assert_equal "Failure preparing input", result[:error]
+    assert_equal :error_response, result[:msg_type]
+  end
+
+  def test_invoke_when_container_errors
+    @environment.expects(:released?).with("demo", "abcdef").returns(true)
+    @environment.expects(:track_dir).with("demo", "abcdef").returns("/tmp/foobar")
+
+    @stub_job_invoker = mock()
+    @stub_job_invoker.expects(:prepare_iteration)
+    @stub_job_invoker.expects(:analyze!).raises("Container error")
+
+    @action.expects(:setup_container_run).with("/tmp/foobar", "my-exercise", "my-input-id").returns @stub_job_invoker
+
+    result = @action.invoke
+    assert_equal 500, result[:status_code]
+    assert_equal "Error from container", result[:error]
+    assert_equal :error_response, result[:msg_type]
+  end
+
+  def test_invoke
+    @invocation_result = { a: 1, b: 2, exit_status: 0 }
+
+    @environment.expects(:released?).with("demo", "abcdef").returns(true)
+    @environment.expects(:track_dir).with("demo", "abcdef").returns("/tmp/foobar")
+
+    @stub_job_invoker = mock()
+    @stub_job_invoker.expects(:prepare_iteration)
+    @stub_job_invoker.expects(:analyze!).returns(@invocation_result)
+
+    @action.expects(:setup_container_run).with("/tmp/foobar", "my-exercise", "my-input-id").returns @stub_job_invoker
+
+    result = @action.invoke
+    assert_equal 1, result[:a]
+    assert_equal 2, result[:b]
+    assert_equal 0, result[:exit_status]
+    assert_equal :response, result[:msg_type]
+  end
+
+end
diff --git a/test/pipeline/rpc/worker/container_action_test.rb b/test/pipeline/rpc/worker/container_action_test.rb
index 306d154..f0b8b5a 100644
--- a/test/pipeline/rpc/worker/container_action_test.rb
+++ b/test/pipeline/rpc/worker/container_action_test.rb
@@ -88,7 +88,7 @@ class Pipeline::Rpc::Worker::WorkerActionTest < Minitest::Test
   end
 
   def test_invoke
-    @invocation_result = { a: 1, b: 2 }
+    @invocation_result = { a: 1, b: 2, exit_status: 0 }
 
     @environment.expects(:released?).with("demo", "abcdef").returns(true)
     @environment.expects(:track_dir).with("demo", "abcdef").returns("/tmp/foobar")
@@ -102,6 +102,7 @@ class Pipeline::Rpc::Worker::WorkerActionTest < Minitest::Test
     result = @action.invoke
     assert_equal 1, result[:a]
     assert_equal 2, result[:b]
+    assert_equal 0, result[:exit_status]
     assert_equal :response, result[:msg_type]
   end