diff --git a/test/integration/standard_filter_test.rb b/test/integration/standard_filter_test.rb
index 62ec5d2d..6b931de5 100644
--- a/test/integration/standard_filter_test.rb
+++ b/test/integration/standard_filter_test.rb
@@ -560,26 +560,6 @@ class StandardFiltersTest < Minitest::Test
     end
   end
 
-  def test_map_with_nil_property
-    array = [
-      { "handle" => "alpha", "value" => "A" },
-      { "handle" => "beta", "value" => "B" },
-      { "handle" => "gamma", "value" => "C" }
-    ]
-
-    assert_template_result("alpha beta gamma", "{{ array | map: nil | map: 'handle' | join: ' ' }}", { "array" => array })
-  end
-
-  def test_map_with_empty_string_property
-    array = [
-      { "handle" => "alpha", "value" => "A" },
-      { "handle" => "beta", "value" => "B" },
-      { "handle" => "gamma", "value" => "C" }
-    ]
-
-    assert_template_result("alpha beta gamma", "{{ array | map: '' | map: 'handle' | join: ' ' }}", { "array" => array })
-  end
-
   def test_map_with_value_property
     array = [
       { "handle" => "alpha", "value" => "A" },
@@ -591,16 +571,15 @@ class StandardFiltersTest < Minitest::Test
   end
 
   def test_map_returns_input_with_no_property
-    input = [
+    foo = [
       [1],
       [2],
       [3],
     ]
-    result = @filters.map(input, nil)
-    assert_equal(input.flatten, result)
 
-    result = @filters.map(input, '')
-    assert_equal(input.flatten, result)
+    assert_raises(Liquid::ArgumentError) do
+      @filters.map(foo, nil)
+    end
   end
 
   def test_sort_works_on_enumerables
@@ -1317,7 +1296,7 @@ class StandardFiltersTest < Minitest::Test
   end
 
   def test_sum_with_non_string_property
-    input = [{ "true" => 1 }, { "1.0" => 0.2, "1" => -0.3 }, { "1..5" => 0.4 }]
+    input = [{ true => 1 }, { 1.0 => 0.2, 1 => -0.3 }, { 1..5 => 0.4 }]
 
     assert_equal(1, @filters.sum(input, true))
     assert_equal(0.2, @filters.sum(input, 1.0))