diff --git a/lib/engine.rb b/lib/engine.rb
--- a/lib/engine.rb
+++ b/lib/engine.rb
@@ -51,8 +51,8 @@
         lang_ext = 'c'
       end
 
-      # FIX THIS
-      talk 'some hack on language'
+      # This is needed because older version of std-scripts/compile
+      # only look for c++.
       if language == 'cpp'
         language = 'c++'
       end
diff --git a/std-script/compile b/std-script/compile
--- a/std-script/compile
+++ b/std-script/compile
@@ -77,6 +77,10 @@
   exit(127)
 end
 
+if params[:prog_lang]=='cpp':
+    params[:prog_lang] = 'c++'
+end
+
 # Compile.
 case params[:prog_lang]
 
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,3 @@
+sandbox
+coverage
+
diff --git a/test/rakefile b/test/rakefile
new file mode 100644
--- /dev/null
+++ b/test/rakefile
@@ -0,0 +1,14 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc "Run all examples"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_files = FileList['*spec.rb']
+end
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('spec_with_rcov') do |t|
+  t.spec_files = FileList['*spec.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', '.*_spec\.rb']
+end