diff -r 4507cb9a0cf1 -r 2ec52027b97f java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java
--- a/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Sun Dec 15 23:54:51 2013 +0100
+++ b/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Sun Dec 15 23:58:58 2013 +0100
@@ -24,7 +24,7 @@
 	}
 
 	@Test
-	public void testParseOptions_QueryNow_Numbered() throws InvalidOptionsException {
+	public void testParseOptions_QueryNow_Numbered() throws InvalidOptionsException, CLIParserException {
 		String[] args = new String[]{Tokens.DB, DATABASE_NAME_1, Tokens.SQL, SQL_1, Tokens.DATA, DATA_1, DATA_2, DATA_3};
 		CLIOptions options = parser.parseOptions(args);
 		options.validate();
@@ -42,8 +42,8 @@
 	}
 
 	@Test
-	public void testParseOptions_QueryNow_Named() throws InvalidOptionsException {
-		String[] args = new String[]{Tokens.DB, DATABASE_NAME_1, Tokens.SQL, SQL_1, Tokens.TYPES};
+	public void testParseOptions_QueryNow_Named() throws InvalidOptionsException, CLIParserException {
+		String[] args = new String[]{Tokens.DB, DATABASE_NAME_1, Tokens.SQL, SQL_1};
 		CLIOptions options = parser.parseOptions(args);
 		options.validate();
 
@@ -53,7 +53,7 @@
 	}
 
 	@Test
-	public void testParseOptions_PrepareBatch() throws InvalidOptionsException {
+	public void testParseOptions_PrepareBatch() throws InvalidOptionsException, CLIParserException {
 		String[] args = new String[]{Tokens.BATCH, Tokens.SQL, SQL_1};
 		CLIOptions options = parser.parseOptions(args);
 		options.validate();
@@ -63,7 +63,7 @@
 	}
 
 	@Test
-	public void testParseOptions_ExecuteBatch() throws InvalidOptionsException {
+	public void testParseOptions_ExecuteBatch() throws InvalidOptionsException, CLIParserException {
 		String[] args = new String[]{Tokens.BATCH, Tokens.DB, DATABASE_NAME_1};
 		CLIOptions options = parser.parseOptions(args);
 		options.validate();