diff --git a/spec/unit/functions/each_spec.rb b/spec/unit/functions/each_spec.rb
index 2cf7d07e7..8276587c9 100644
--- a/spec/unit/functions/each_spec.rb
+++ b/spec/unit/functions/each_spec.rb
@@ -1,110 +1,111 @@
 require 'puppet'
 require 'spec_helper'
 require 'puppet_spec/compiler'
 
 require 'unit/functions/shared'
 
 describe 'the each method' do
   include PuppetSpec::Compiler
 
   before :each do
     Puppet[:parser] = 'future'
   end
 
   context "should be callable as" do
     it 'each on an array selecting each value' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = [1,2,3]
         $a.each |$v| {
           file { "/file_$v": ensure => present }
         }
       MANIFEST
 
       catalog.resource(:file, "/file_1")['ensure'].should == 'present'
       catalog.resource(:file, "/file_2")['ensure'].should == 'present'
       catalog.resource(:file, "/file_3")['ensure'].should == 'present'
     end
+
     it 'each on an array selecting each value - function call style' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = [1,2,3]
         each ($a) |$index, $v| {
           file { "/file_$v": ensure => present }
         }
       MANIFEST
 
       catalog.resource(:file, "/file_1")['ensure'].should == 'present'
       catalog.resource(:file, "/file_2")['ensure'].should == 'present'
       catalog.resource(:file, "/file_3")['ensure'].should == 'present'
     end
 
     it 'each on an array with index' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = [present, absent, present]
         $a.each |$k,$v| {
           file { "/file_${$k+1}": ensure => $v }
         }
       MANIFEST
 
       catalog.resource(:file, "/file_1")['ensure'].should == 'present'
       catalog.resource(:file, "/file_2")['ensure'].should == 'absent'
       catalog.resource(:file, "/file_3")['ensure'].should == 'present'
     end
 
     it 'each on a hash selecting entries' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = {'a'=>'present','b'=>'absent','c'=>'present'}
         $a.each |$e| {
         file { "/file_${e[0]}": ensure => $e[1] }
         }
       MANIFEST
 
       catalog.resource(:file, "/file_a")['ensure'].should == 'present'
       catalog.resource(:file, "/file_b")['ensure'].should == 'absent'
       catalog.resource(:file, "/file_c")['ensure'].should == 'present'
     end
 
     it 'each on a hash selecting key and value' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = {'a'=>present,'b'=>absent,'c'=>present}
         $a.each |$k, $v| {
           file { "/file_$k": ensure => $v }
         }
       MANIFEST
 
       catalog.resource(:file, "/file_a")['ensure'].should == 'present'
       catalog.resource(:file, "/file_b")['ensure'].should == 'absent'
       catalog.resource(:file, "/file_c")['ensure'].should == 'present'
     end
 
     it 'each on a hash selecting key and value (using captures-last parameter)' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = {'a'=>present,'b'=>absent,'c'=>present}
         $a.each |*$kv| {
           file { "/file_${kv[0]}": ensure => $kv[1] }
         }
       MANIFEST
 
       catalog.resource(:file, "/file_a")['ensure'].should == 'present'
       catalog.resource(:file, "/file_b")['ensure'].should == 'absent'
       catalog.resource(:file, "/file_c")['ensure'].should == 'present'
     end
   end
 
   context "should produce receiver" do
     it 'each checking produced value using single expression' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = [1, 3, 2]
         $b = $a.each |$x| { "unwanted" }
         file { "/file_${b[1]}":
           ensure => present
         }
       MANIFEST
 
       catalog.resource(:file, "/file_3")['ensure'].should == 'present'
     end
 
   end
   it_should_behave_like 'all iterative functions argument checks', 'each'
   it_should_behave_like 'all iterative functions hash handling', 'each'
 
 end
diff --git a/spec/unit/functions/map_spec.rb b/spec/unit/functions/map_spec.rb
index 9077cce17..6c482066d 100644
--- a/spec/unit/functions/map_spec.rb
+++ b/spec/unit/functions/map_spec.rb
@@ -1,191 +1,169 @@
 require 'puppet'
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'matchers/resource'
 
 require 'unit/functions/shared'
 
 describe 'the map method' do
   include PuppetSpec::Compiler
   include Matchers::Resource
 
   before :each do
     Puppet[:parser] = "future"
   end
 
   context "using future parser" do
     it 'map on an array (multiplying each value by 2)' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = [1,2,3]
         $a.map |$x|{ $x*2}.each |$v|{
           file { "/file_$v": ensure => present }
         }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_2]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_4]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_6]").with_parameter(:ensure, 'present')
     end
 
     it 'map on an enumerable type (multiplying each value by 2)' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = Integer[1,3]
         $a.map |$x|{ $x*2}.each |$v|{
           file { "/file_$v": ensure => present }
         }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_2]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_4]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_6]").with_parameter(:ensure, 'present')
     end
 
     it 'map on an integer (multiply each by 3)' do
       catalog = compile_to_catalog(<<-MANIFEST)
         3.map |$x|{ $x*3}.each |$v|{
           file { "/file_$v": ensure => present }
         }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_0]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_3]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_6]").with_parameter(:ensure, 'present')
     end
 
     it 'map on a string' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = {a=>x, b=>y}
         "ab".map |$x|{$a[$x]}.each |$v|{
           file { "/file_$v": ensure => present }
         }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_x]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_y]").with_parameter(:ensure, 'present')
     end
 
     it 'map on an array (multiplying value by 10 in even index position)' do
       catalog = compile_to_catalog(<<-MANIFEST)
         $a = [1,2,3]
         $a.map |$i, $x|{ if $i % 2 == 0 {$x} else {$x*10}}.each |$v|{
           file { "/file_$v": ensure => present }
         }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_1]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_20]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_3]").with_parameter(:ensure, 'present')
     end
 
     it 'map on a hash selecting keys' do
       catalog = compile_to_catalog(<<-MANIFEST)
       $a = {'a'=>1,'b'=>2,'c'=>3}
       $a.map |$x|{ $x[0]}.each |$k|{
           file { "/file_$k": ensure => present }
         }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_a]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_b]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_c]").with_parameter(:ensure, 'present')
     end
 
     it 'map on a hash selecting keys - using two block parameters' do
       catalog = compile_to_catalog(<<-MANIFEST)
       $a = {'a'=>1,'b'=>2,'c'=>3}
       $a.map |$k,$v|{ file { "/file_$k": ensure => present }
         }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_a]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_b]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_c]").with_parameter(:ensure, 'present')
     end
 
     it 'map on a hash using captures-last parameter' do
       catalog = compile_to_catalog(<<-MANIFEST)
       $a = {'a'=>present,'b'=>absent,'c'=>present}
       $a.map |*$kv|{ file { "/file_${kv[0]}": ensure => $kv[1] } }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_a]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_b]").with_parameter(:ensure, 'absent')
       expect(catalog).to have_resource("File[/file_c]").with_parameter(:ensure, 'present')
     end
 
     it 'each on a hash selecting value' do
       catalog = compile_to_catalog(<<-MANIFEST)
       $a = {'a'=>1,'b'=>2,'c'=>3}
       $a.map |$x|{ $x[1]}.each |$k|{ file { "/file_$k": ensure => present } }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_1]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_2]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_3]").with_parameter(:ensure, 'present')
     end
 
     it 'each on a hash selecting value - using two block parameters' do
       catalog = compile_to_catalog(<<-MANIFEST)
       $a = {'a'=>1,'b'=>2,'c'=>3}
       $a.map |$k,$v|{ file { "/file_$v": ensure => present } }
       MANIFEST
 
       expect(catalog).to have_resource("File[/file_1]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_2]").with_parameter(:ensure, 'present')
       expect(catalog).to have_resource("File[/file_3]").with_parameter(:ensure, 'present')
     end
 
     context "handles data type corner cases" do
       it "map gets values that are false" do
         catalog = compile_to_catalog(<<-MANIFEST)
           $a = [false,false]
           $a.map |$x| { $x }.each |$i, $v| {
             file { "/file_$i.$v": ensure => present }
           }
         MANIFEST
 
         expect(catalog).to have_resource("File[/file_0.false]").with_parameter(:ensure, 'present')
         expect(catalog).to have_resource("File[/file_1.false]").with_parameter(:ensure, 'present')
       end
 
       it "map gets values that are nil" do
         Puppet::Parser::Functions.newfunction(:nil_array, :type => :rvalue) do |args|
           [nil]
         end
         catalog = compile_to_catalog(<<-MANIFEST)
           $a = nil_array()
           $a.map |$x| { $x }.each |$i, $v| {
             file { "/file_$i.$v": ensure => present }
           }
         MANIFEST
 
         expect(catalog).to have_resource("File[/file_0.]").with_parameter(:ensure, 'present')
       end
-
-      it "map gets values that are undef" do
-        pending "Test is flawed, but has good intentions - should be rewritten when map has moved to new func API"
-        # The test is broken because:
-        # - a bug caused the given value to always be overridden by a given lambda default
-        # - non existing variable results in nil / undef, which is transformed to empty string in the 3x func API
-        # - when lambda is called, it gets an empty string, and it is then expected to use the default value
-        #
-        # This is not the semantics we want (only missing argument should trigger the default value).
-        # Finally, it is not possible to test missing arguments with the map function since the call adapts itself
-        # to the number of lambda parameters. (There is testing of this elsewhere).
-        #
-        # TODO: Rewrite map function, then test that undef / nil values are passed correctly to the lambda
-        #
-        catalog = compile_to_catalog(<<-MANIFEST)
-          $a = [$does_not_exist]
-          $a.map |$x = "something"| { $x }.each |$i, $v| {
-            file { "/file_$i.$v": ensure => present }
-          }
-        MANIFEST
-        catalog.resource(:file, "/file_0.something")['ensure'].should == 'present'
-      end
     end
 
   it_should_behave_like 'all iterative functions argument checks', 'map'
   it_should_behave_like 'all iterative functions hash handling', 'map'
   end
 end