--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java	Fri Feb 15 09:44:15 2013 +0100
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java	Fri Feb 15 18:30:19 2013 +0530
@@ -50,7 +50,6 @@
 import jdk.nashorn.internal.runtime.Version;
 import netscape.javascript.JSObject;
 import org.testng.Assert;
-import org.testng.TestNG;
 import org.testng.annotations.Test;
 
 /**
@@ -58,10 +57,6 @@
  */
 public class ScriptEngineTest {
 
-    public static void main(final String[] args) {
-        TestNG.main(args);
-    }
-
     private void log(String msg) {
         org.testng.Reporter.log(msg, true);
     }
@@ -132,6 +127,7 @@
         assertEquals(fac.getEngineName(), "Oracle Nashorn");
         assertEquals(fac.getEngineVersion(), Version.version());
         assertEquals(fac.getOutputStatement("context"), "print(context)");
+        assertEquals(fac.getProgram("print('hello')", "print('world')"), "print('hello');print('world');");
         assertEquals(fac.getParameter(ScriptEngine.NAME), "javascript");
 
         boolean seenJS = false;
@@ -808,6 +804,9 @@
                 fail("obj.prop is not deleted!");
             }
 
+            // Simple eval tests
+            assertEquals(obj.eval("typeof Object"), "function");
+            assertEquals(obj.eval("'nashorn'.substring(3)"), "horn");
         } catch (final Exception exp) {
             exp.printStackTrace();
             fail(exp.getMessage());