diff --git a/test/test_default_commands/test_introspection.rb b/test/test_default_commands/test_introspection.rb
index 8ace97e3..69a38003 100644
--- a/test/test_default_commands/test_introspection.rb
+++ b/test/test_default_commands/test_introspection.rb
@@ -499,7 +499,6 @@ describe "Pry::DefaultCommands::Introspection" do
           @reloading.should == false
         end
       end
-
     end
   end
 end
diff --git a/test/test_default_commands/test_ls.rb b/test/test_default_commands/test_ls.rb
index cbd75a38..5a4c2567 100644
--- a/test/test_default_commands/test_ls.rb
+++ b/test/test_default_commands/test_ls.rb
@@ -3,99 +3,99 @@ require 'helper'
 describe "ls" do
   describe "below ceiling" do
     it "should stop before Object by default" do
-      mock_pry("cd Class.new{ def goo; end }.new", "ls").should.not =~ /Object/
-      mock_pry("cd Class.new{ def goo; end }", "ls -M").should.not =~ /Object/
+      pry_eval("cd Class.new{ def goo; end }.new", "ls").should.not =~ /Object/
+      pry_eval("cd Class.new{ def goo; end }", "ls -M").should.not =~ /Object/
     end
 
     it "should include object if -v is given" do
-      mock_pry("cd Class.new{ def goo; end }.new", "ls -m -v").should =~ /Object/
-      mock_pry("cd Class.new{ def goo; end }", "ls -vM").should =~ /Object/
+      pry_eval("cd Class.new{ def goo; end }.new", "ls -m -v").should =~ /Object/
+      pry_eval("cd Class.new{ def goo; end }", "ls -vM").should =~ /Object/
     end
 
     it "should include super-classes by default" do
-      mock_pry("cd Class.new(Class.new{ def goo; end }).new", "ls").should =~ /goo/
-      mock_pry("cd Class.new(Class.new{ def goo; end })", "ls -M").should =~ /goo/
+      pry_eval("cd Class.new(Class.new{ def goo; end }).new", "ls").should =~ /goo/
+      pry_eval("cd Class.new(Class.new{ def goo; end })", "ls -M").should =~ /goo/
     end
 
     it "should not include super-classes when -q is given" do
-      mock_pry("cd Class.new(Class.new{ def goo; end }).new", "ls -q").should.not =~ /goo/
-      mock_pry("cd Class.new(Class.new{ def goo; end })", "ls -M -q").should.not =~ /goo/
+      pry_eval("cd Class.new(Class.new{ def goo; end }).new", "ls -q").should.not =~ /goo/
+      pry_eval("cd Class.new(Class.new{ def goo; end })", "ls -M -q").should.not =~ /goo/
     end
   end
 
   describe "help" do
     it 'should show help with -h' do
-      mock_pry("ls -h").should =~ /Usage: ls/
+      pry_eval("ls -h").should =~ /Usage: ls/
     end
   end
 
   describe "methods" do
     it "should show public methods by default" do
-      mock_pry("ls Class.new{ def goo; end }.new").should =~ /methods: goo/
+      pry_eval("ls Class.new{ def goo; end }.new").should =~ /methods: goo/
     end
 
     it "should not show protected/private by default" do
-      mock_pry("ls -M Class.new{ def goo; end; private :goo }").should.not =~ /methods: goo/
-      mock_pry("ls Class.new{ def goo; end; protected :goo }.new").should.not =~ /methods: goo/
+      pry_eval("ls -M Class.new{ def goo; end; private :goo }").should.not =~ /methods: goo/
+      pry_eval("ls Class.new{ def goo; end; protected :goo }.new").should.not =~ /methods: goo/
     end
 
     it "should show public methods with -p" do
-      mock_pry("ls -p Class.new{ def goo; end }.new").should =~ /methods: goo/
+      pry_eval("ls -p Class.new{ def goo; end }.new").should =~ /methods: goo/
     end
 
     it "should show protected/private methods with -p" do
-      mock_pry("ls -pM Class.new{ def goo; end; protected :goo }").should =~ /methods: goo/
-      mock_pry("ls -p Class.new{ def goo; end; private :goo }.new").should =~ /methods: goo/
+      pry_eval("ls -pM Class.new{ def goo; end; protected :goo }").should =~ /methods: goo/
+      pry_eval("ls -p Class.new{ def goo; end; private :goo }.new").should =~ /methods: goo/
     end
 
     it "should work for objects with an overridden method method" do
       require 'net/http'
       # This doesn't actually touch the network, promise!
-      mock_pry("ls Net::HTTP::Get.new('localhost')").should =~ /Net::HTTPGenericRequest#methods/
+      pry_eval("ls Net::HTTP::Get.new('localhost')").should =~ /Net::HTTPGenericRequest#methods/
     end
   end
 
   describe "when inside Modules" do
     it "should still work" do
-      mock_pry("cd Module.new{ def foobie; end }", "ls -M").should =~ /foobie/
+      pry_eval("cd Module.new{ def foobie; end }", "ls -M").should =~ /foobie/
     end
 
     it "should work for ivars" do
-      mock_pry("module StigmaT1sm; def foobie; @@gharble = 456; end; end", "Object.new.tap{ |o| o.extend(StigmaT1sm) }.foobie", "cd StigmaT1sm", "ls -i").should =~ /@@gharble/
+      pry_eval("module StigmaT1sm; def foobie; @@gharble = 456; end; end", "Object.new.tap{ |o| o.extend(StigmaT1sm) }.foobie", "cd StigmaT1sm", "ls -i").should =~ /@@gharble/
     end
 
     it "should include instance methods by default" do
-      mock_pry("ls Module.new{ def shinanagarns; 4; end }").should =~ /shinanagarns/
+      pry_eval("ls Module.new{ def shinanagarns; 4; end }").should =~ /shinanagarns/
     end
   end
 
   describe "constants" do
     it "should show constants defined on the current module" do
-      mock_pry("class TempFoo1; BARGHL = 1; end", "ls TempFoo1").should =~ /BARGHL/
+      pry_eval("class TempFoo1; BARGHL = 1; end", "ls TempFoo1").should =~ /BARGHL/
     end
 
     it "should not show constants defined on parent modules by default" do
-      mock_pry("class TempFoo2; LHGRAB = 1; end; class TempFoo3 < TempFoo2; BARGHL = 1; end", "ls TempFoo3").should.not =~ /LHGRAB/
+      pry_eval("class TempFoo2; LHGRAB = 1; end; class TempFoo3 < TempFoo2; BARGHL = 1; end", "ls TempFoo3").should.not =~ /LHGRAB/
     end
 
     it "should show constants defined on ancestors with -v" do
-      mock_pry("class TempFoo4; LHGRAB = 1; end; class TempFoo5 < TempFoo4; BARGHL = 1; end", "ls -v TempFoo5").should =~ /LHGRAB/
+      pry_eval("class TempFoo4; LHGRAB = 1; end; class TempFoo5 < TempFoo4; BARGHL = 1; end", "ls -v TempFoo5").should =~ /LHGRAB/
     end
 
     it "should not autoload constants!" do
       autoload :McflurgleTheThird, "/tmp/this-file-d000esnat-exist.rb"
-      lambda{ mock_pry("ls -c") }.should.not.raise
+      lambda{ pry_eval("ls -c") }.should.not.raise
     end
   end
 
   describe "grep" do
     it "should reduce the number of outputted things" do
-      mock_pry("ls -c").should =~ /ArgumentError/
-      mock_pry("ls -c --grep Run").should.not =~ /ArgumentError/
+      pry_eval("ls -c").should =~ /ArgumentError/
+      pry_eval("ls -c --grep Run").should.not =~ /ArgumentError/
     end
 
     it "should still output matching things" do
-      mock_pry("ls -c --grep Run").should =~ /RuntimeError/
+      pry_eval("ls -c --grep Run").should =~ /RuntimeError/
     end
   end
 
@@ -104,33 +104,33 @@ describe "ls" do
       # rubinius has a bug that means local_variables of "main" aren't reported inside eval()
       unless Pry::Helpers::BaseHelpers.rbx?
         it "should show local variables" do
-          mock_pry("ls").should =~ /_pry_/
-          mock_pry("arbitrar = 1", "ls").should =~ /arbitrar/
+          pry_eval("ls").should =~ /_pry_/
+          pry_eval("arbitrar = 1", "ls").should =~ /arbitrar/
         end
       end
     end
 
     describe "when in a class" do
       it "should show constants" do
-        mock_pry("class GeFromulate1; FOOTIFICATE=1.3; end", "cd GeFromulate1", "ls").should =~ /FOOTIFICATE/
+        pry_eval("class GeFromulate1; FOOTIFICATE=1.3; end", "cd GeFromulate1", "ls").should =~ /FOOTIFICATE/
       end
 
       it "should show class variables" do
-        mock_pry("class GeFromulate2; @@flurb=1.3; end", "cd GeFromulate2", "ls").should =~ /@@flurb/
+        pry_eval("class GeFromulate2; @@flurb=1.3; end", "cd GeFromulate2", "ls").should =~ /@@flurb/
       end
 
       it "should show methods" do
-        mock_pry("class GeFromulate3; def self.mooflight; end ; end", "cd GeFromulate3", "ls").should =~ /mooflight/
+        pry_eval("class GeFromulate3; def self.mooflight; end ; end", "cd GeFromulate3", "ls").should =~ /mooflight/
       end
     end
 
     describe "when in an object" do
       it "should show methods" do
-        mock_pry("cd Class.new{ def self.fooerise; end; self }", "ls").should =~ /fooerise/
+        pry_eval("cd Class.new{ def self.fooerise; end; self }", "ls").should =~ /fooerise/
       end
 
       it "should show instance variables" do
-        mock_pry("cd Class.new", "@alphooent = 1", "ls").should =~ /@alphooent/
+        pry_eval("cd Class.new", "@alphooent = 1", "ls").should =~ /@alphooent/
       end
     end
   end
@@ -138,13 +138,13 @@ describe "ls" do
   if Pry::Helpers::BaseHelpers.jruby?
     describe 'on java objects' do
       it 'should omit java-esque aliases by default' do
-        mock_pry('ls java.lang.Thread.current_thread').should =~ / thread_group /
-        mock_pry('ls java.lang.Thread.current_thread').should.not =~ / getThreadGroup /
+        pry_eval('ls java.lang.Thread.current_thread').should =~ / thread_group /
+        pry_eval('ls java.lang.Thread.current_thread').should.not =~ / getThreadGroup /
       end
 
       it 'should include java-esque aliases if requested' do
-        mock_pry('ls java.lang.Thread.current_thread -J').should =~ / thread_group /
-        mock_pry('ls java.lang.Thread.current_thread -J').should =~ / getThreadGroup /
+        pry_eval('ls java.lang.Thread.current_thread -J').should =~ / thread_group /
+        pry_eval('ls java.lang.Thread.current_thread -J').should =~ / getThreadGroup /
       end
     end
   end