diff --git a/spec/expectations/expectation_spec.cr b/spec/expectations/expectation_spec.cr
index 06540fc..eaac487 100644
--- a/spec/expectations/expectation_spec.cr
+++ b/spec/expectations/expectation_spec.cr
@@ -48,4 +48,110 @@ describe Spectator::Expectations::Expectation do
       end
     end
   end
+
+  describe "#values" do
+    it "is the same as the match data values" do
+      value = 42
+      match_data = new_matcher(value).match(new_partial(value))
+      expectation = Spectator::Expectations::Expectation.new(match_data, false)
+      expectation_values = expectation.values
+      match_data.values.zip(expectation_values).each do |m, e|
+        m.label.should eq(e.label)
+        m.value.value.should eq(e.value.value)
+      end
+    end
+
+    context "when negated" do
+      it "negates all negatable values" do
+        value = 42
+        match_data = new_matcher(value).match(new_partial(value))
+        expectation = Spectator::Expectations::Expectation.new(match_data, true)
+        expectation.values.each do |labeled_value|
+          label = labeled_value.label
+          value = labeled_value.value
+          value.to_s.should start_with(/not/i) if label == :expected
+        end
+      end
+    end
+  end
+
+  describe "#actual_message" do
+    context "with a successful match" do
+      it "equals the matcher's #message" do
+        value = 42
+        match_data = new_matcher(value).match(new_partial(value))
+        match_data.matched?.should be_true # Sanity check.
+        expectation = Spectator::Expectations::Expectation.new(match_data, false)
+        expectation.actual_message.should eq(match_data.message)
+      end
+
+      context "when negated" do
+        it "equals the matcher's #message" do
+          value = 42
+          match_data = new_matcher(value).match(new_partial(value))
+          match_data.matched?.should be_true # Sanity check.
+          expectation = Spectator::Expectations::Expectation.new(match_data, true)
+          expectation.actual_message.should eq(match_data.message)
+        end
+      end
+    end
+
+    context "with an unsuccessful match" do
+      it "equals the matcher's #negated_message" do
+        match_data = new_matcher(42).match(new_partial(777))
+        match_data.matched?.should be_false # Sanity check.
+        expectation = Spectator::Expectations::Expectation.new(match_data, false)
+        expectation.actual_message.should eq(match_data.negated_message)
+      end
+
+      context "when negated" do
+        it "equals the matcher's #negated_message" do
+          match_data = new_matcher(42).match(new_partial(777))
+          match_data.matched?.should be_false # Sanity check.
+          expectation = Spectator::Expectations::Expectation.new(match_data, true)
+          expectation.actual_message.should eq(match_data.negated_message)
+        end
+      end
+    end
+  end
+
+  describe "#expected_message" do
+    context "with a successful match" do
+      it "equals the matcher's #message" do
+        value = 42
+        match_data = new_matcher(value).match(new_partial(value))
+        match_data.matched?.should be_true # Sanity check.
+        expectation = Spectator::Expectations::Expectation.new(match_data, false)
+        expectation.expected_message.should eq(match_data.message)
+      end
+
+      context "when negated" do
+        it "equals the matcher's #negated_message" do
+          value = 42
+          match_data = new_matcher(value).match(new_partial(value))
+          match_data.matched?.should be_true # Sanity check.
+          expectation = Spectator::Expectations::Expectation.new(match_data, true)
+          expectation.expected_message.should eq(match_data.negated_message)
+        end
+      end
+    end
+
+    context "with an unsuccessful match" do
+      it "equals the matcher's #message" do
+        match_data = new_matcher(42).match(new_partial(777))
+        match_data.matched?.should be_false # Sanity check.
+        expectation = Spectator::Expectations::Expectation.new(match_data, false)
+        expectation.expected_message.should eq(match_data.message)
+      end
+
+      context "when negated" do
+        it "equals the matcher's #negated_message" do
+          match_data = new_matcher(42).match(new_partial(777))
+          match_data.matched?.should be_false # Sanity check.
+          expectation = Spectator::Expectations::Expectation.new(match_data, true)
+          expectation.expected_message.should eq(match_data.negated_message)
+        end
+      end
+    end
+  end
 end
diff --git a/src/spectator/expectations/expectation.cr b/src/spectator/expectations/expectation.cr
index 526d1a5..300f134 100644
--- a/src/spectator/expectations/expectation.cr
+++ b/src/spectator/expectations/expectation.cr
@@ -66,10 +66,5 @@ module Spectator::Expectations
         end
       end
     end
-
-    # Indicates whether the match data should be negated.
-    private def negated?
-      !@match_data.override? && @negated
-    end
   end
 end