--- a/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Sun Jan 19 18:30:21 2014 +0100
+++ b/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Mon Jan 20 00:05:23 2014 +0100
@@ -20,6 +20,7 @@
 import info.globalcode.sql.dk.CLIParser.Tokens;
 import static info.globalcode.sql.dk.CLIParser.TYPE_NAME_SEPARATOR;
 import info.globalcode.sql.dk.InfoLister.InfoType;
+import java.io.ByteArrayInputStream;
 import java.util.Collection;
 import static org.testng.Assert.*;
 import org.testng.annotations.BeforeMethod;
@@ -46,12 +47,16 @@
 		parser = new CLIParser();
 	}
 
+	private CLIOptions parseOptions(String[] args) throws CLIParserException {
+		return parser.parseOptions(args, new ByteArrayInputStream("".getBytes()));
+	}
+
 	@Test
 	public void testParseOptions_QueryNow_NoParams() throws InvalidOptionsException, CLIParserException {
 		String[] args = new String[]{
 			Tokens.DB, DATABASE_NAME_1,
 			Tokens.SQL, SQL_1};
-		CLIOptions options = parser.parseOptions(args);
+		CLIOptions options = parseOptions(args);
 		options.validate();
 
 		assertEquals(options.getDatabaseName(), DATABASE_NAME_1);
@@ -67,7 +72,7 @@
 			Tokens.DB, DATABASE_NAME_1,
 			Tokens.SQL, SQL_1,
 			Tokens.DATA, DATA_1, DATA_2, DATA_3};
-		CLIOptions options = parser.parseOptions(args);
+		CLIOptions options = parseOptions(args);
 		options.validate();
 
 		assertEquals(options.getDatabaseName(), DATABASE_NAME_1);
@@ -89,7 +94,7 @@
 			Tokens.SQL, SQL_1,
 			Tokens.TYPES, " INTEGER,VARCHAR, BOOLEAN",
 			Tokens.DATA, DATA_1, DATA_2, DATA_3};
-		CLIOptions options = parser.parseOptions(args);
+		CLIOptions options = parseOptions(args);
 		options.validate();
 
 		assertEquals(options.getDatabaseName(), DATABASE_NAME_1);
@@ -110,7 +115,7 @@
 			Tokens.DB, DATABASE_NAME_1,
 			Tokens.SQL, SQL_1,
 			Tokens.DATA_NAMED, NAME_1, DATA_1, NAME_2, DATA_2, NAME_3, DATA_3};
-		CLIOptions options = parser.parseOptions(args);
+		CLIOptions options = parseOptions(args);
 		options.validate();
 
 		assertEquals(options.getDatabaseName(), DATABASE_NAME_1);
@@ -130,7 +135,7 @@
 			Tokens.NAME_PREFIX, "$",
 			Tokens.TYPES, " " + NAME_1 + TYPE_NAME_SEPARATOR + "INTEGER" + "," + NAME_3 + TYPE_NAME_SEPARATOR + "BOOLEAN",
 			Tokens.DATA_NAMED, NAME_1, DATA_1, NAME_2, DATA_2, NAME_3, DATA_3};
-		CLIOptions options = parser.parseOptions(args);
+		CLIOptions options = parseOptions(args);
 		options.validate();
 
 		assertEquals(options.getDatabaseName(), DATABASE_NAME_1);
@@ -158,7 +163,7 @@
 		String[] args = new String[]{
 			Tokens.BATCH,
 			Tokens.SQL, SQL_1};
-		CLIOptions options = parser.parseOptions(args);
+		CLIOptions options = parseOptions(args);
 		options.validate();
 
 		assertEquals(options.getSql(), SQL_1);
@@ -170,7 +175,7 @@
 		String[] args = new String[]{
 			Tokens.BATCH,
 			Tokens.DB, DATABASE_NAME_1};
-		CLIOptions options = parser.parseOptions(args);
+		CLIOptions options = parseOptions(args);
 		options.validate();
 
 		assertEquals(options.getDatabaseName(), DATABASE_NAME_1);
@@ -180,7 +185,7 @@
 	@Test
 	public void testParseOptions_ShowInfo_Help() throws InvalidOptionsException, CLIParserException {
 		String[] args = new String[]{Tokens.INFO_HELP};
-		CLIOptions options = parser.parseOptions(args);
+		CLIOptions options = parseOptions(args);
 		options.validate();
 
 		assertEquals(options.getMode(), CLIOptions.MODE.JUST_SHOW_INFO);