diff --git a/spec/unit/functions/map_spec.rb b/spec/unit/functions/map_spec.rb
index addce2558..ed5aa0cc9 100644
--- a/spec/unit/functions/map_spec.rb
+++ b/spec/unit/functions/map_spec.rb
@@ -1,165 +1,163 @@
 require 'puppet'
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'matchers/resource'
 
 require 'shared_behaviours/iterative_functions'
 
-describe 'the map method' do
+describe 'the map method can' do
   include PuppetSpec::Compiler
   include Matchers::Resource
 
-  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
     end
 
   it_should_behave_like 'all iterative functions argument checks', 'map'
   it_should_behave_like 'all iterative functions hash handling', 'map'
-  end
 end