Fix for offset changes due to change to binary in jsp test files.  Needed to introduce tests into the WTP build.
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/AllTests_1_1.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/AllTests_1_1.java
index 8a4dcce..a4ef1dc 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/AllTests_1_1.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/AllTests_1_1.java
@@ -7,15 +7,16 @@
 import org.eclipse.jst.jsf.test.util.ConfigurableTestSuite;
 import org.eclipse.jst.jsf.test.util.ConfigurableTestCase.TestConfiguration;
 import org.eclipse.jst.jsf.validation.el.tests.base.BaseTestCase;
+import org.eclipse.jst.jsf.validation.el.tests.base.JSPTestCase;
 import org.eclipse.jst.jsf.validation.el.tests.base.SingleJSPTestCase;
 
-public class AllTests_1_1 
+public class AllTests_1_1
 {
-    public static Test suite() 
+    public static Test suite()
     {
-        TestSuite suite = new TestSuite("EL Validation Testing  (1.1 only)");
-        
-        TestConfiguration  configuration = new TestConfiguration();
+        final TestSuite suite = new TestSuite("EL Validation Testing  (1.1 only)");
+
+        final TestConfiguration  configuration = new TestConfiguration();
         configuration.put(BaseTestCase.PROXY_SETTING_HOST, "www-proxy.uk.oracle.com");
         configuration.put(BaseTestCase.PROXY_SETTING_PORT, "80");
 
@@ -26,13 +27,13 @@
     /**
      * @return the test suite
      */
-    public static Test getFacesSuite(TestConfiguration commonConfig) 
+    public static Test getFacesSuite(final TestConfiguration commonConfig)
     {
         // add JSF 1.1 specific configs to common config
         commonConfig.put(BaseTestCase.JSF_FACET_VERSION, IJSFCoreConstants.FACET_VERSION_1_1);
-        commonConfig.put(SingleJSPTestCase.FACES_CONFIG_FILE, SingleJSPTestCase.FACES_CONFIG_FILE_NAME_1_1);
+        commonConfig.put(JSPTestCase.FACES_CONFIG_FILE, SingleJSPTestCase.FACES_CONFIG_FILE_NAME_1_1);
 
-        TestSuite suite = new ConfigurableTestSuite(commonConfig, "JSF 1.1 EL Validation Tests");
+        final TestSuite suite = new ConfigurableTestSuite(commonConfig, "JSF 1.1 EL Validation Tests");
 
         CommonTests.getFaces_common_suite(suite);
 
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/AllTests_1_2.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/AllTests_1_2.java
index 3c86be6..1eaaff5 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/AllTests_1_2.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/AllTests_1_2.java
@@ -7,34 +7,35 @@
 import org.eclipse.jst.jsf.test.util.ConfigurableTestSuite;
 import org.eclipse.jst.jsf.test.util.ConfigurableTestCase.TestConfiguration;
 import org.eclipse.jst.jsf.validation.el.tests.base.BaseTestCase;
+import org.eclipse.jst.jsf.validation.el.tests.base.JSPTestCase;
 import org.eclipse.jst.jsf.validation.el.tests.base.SingleJSPTestCase;
 import org.eclipse.jst.jsf.validation.el.tests.jsp.ResourceBundleTestCase;
 
 public class AllTests_1_2 {
-    public static Test suite() 
+    public static Test suite()
     {
-        TestSuite suite = new TestSuite("JSF EL Validation Testing (1.2 only)");
-        
-        TestConfiguration  configuration = new TestConfiguration();
-        configuration.put(BaseTestCase.PROXY_SETTING_HOST, "www-proxy.uk.oracle.com");
+        final TestSuite suite = new TestSuite("JSF EL Validation Testing (1.2 only)");
+
+        final TestConfiguration  configuration = new TestConfiguration();
+        configuration.put(BaseTestCase.PROXY_SETTING_HOST, "www-proxy.us.oracle.com");
         configuration.put(BaseTestCase.PROXY_SETTING_PORT, "80");
 
         suite.addTest(getFacesSuite((TestConfiguration) configuration.clone()));
         return suite;
     }
-    
-    public static Test getFacesSuite(TestConfiguration commonConfig)
+
+    public static Test getFacesSuite(final TestConfiguration commonConfig)
     {
         // add JSF 1.2 specific configs to common config
         commonConfig.put(BaseTestCase.JSF_FACET_VERSION, IJSFCoreConstants.FACET_VERSION_1_2);
-        commonConfig.put(SingleJSPTestCase.FACES_CONFIG_FILE, SingleJSPTestCase.FACES_CONFIG_FILE_NAME_1_2);
+        commonConfig.put(JSPTestCase.FACES_CONFIG_FILE, SingleJSPTestCase.FACES_CONFIG_FILE_NAME_1_2);
 
-        TestSuite suite = new ConfigurableTestSuite(commonConfig, "JSF 1.2 EL Validation Tests");
+        final TestSuite suite = new ConfigurableTestSuite(commonConfig, "JSF 1.2 EL Validation Tests");
 
         // JSF 1.2 only tests
         suite.addTest(new ConfigurableTestSuite(ResourceBundleTestCase.class));
         CommonTests.getFaces_common_suite(suite);
-        
+
         return suite;
     }
 
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticAddTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticAddTestCase.java
index 2c6a1ba..8916a7d 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticAddTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticAddTestCase.java
@@ -16,94 +16,99 @@
  * @author cbateman
  *
  */
-public class ArithmeticAddTestCase extends SingleJSPTestCase 
+public class ArithmeticAddTestCase extends SingleJSPTestCase
 {
     public ArithmeticAddTestCase()
     {
         super("/testdata/jsps/arithmeticAdd.jsp.data", "/arithmeticAdd.jsp", JSFVersion.V1_1, FACES_CONFIG_FILE_NAME_1_1);
     }
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("myBean.integerProperty  + 3", getELText(_structuredDocument,900));
-        assertEquals("myBean.stringProperty + 3", getELText(_structuredDocument,961));
-        assertEquals("myBean.integerProperty + myBean.integerProperty", getELText(_structuredDocument,1020));
-        assertEquals("myBean.bigIntegerProperty + 4", getELText(_structuredDocument,1101));
-        assertEquals("myBean.bigIntegerProperty + 5.5", getELText(_structuredDocument,1164));
-        assertEquals("myBean.bigDoubleProperty + 5.5", getELText(_structuredDocument,1229));
-        assertEquals("myBean.doubleProperty + 5", getELText(_structuredDocument,1293));
 
-        assertEquals("5 + 3", getELText(_structuredDocument,1381));
-        assertEquals("5.5 + 4", getELText(_structuredDocument,1417));
-        assertEquals("5.5 + null", getELText(_structuredDocument,1455));
-        assertEquals("'5' + '4'", getELText(_structuredDocument,1499));
-        assertEquals("null + null", getELText(_structuredDocument,1542));
-        assertEquals("5.5 + 3.5", getELText(_structuredDocument,1588));
+        assertEquals("myBean.integerProperty  + 3", getELText(_structuredDocument,874));
+        assertEquals("myBean.stringProperty + 3", getELText(_structuredDocument,934));
+        assertEquals("myBean.integerProperty + myBean.integerProperty", getELText(_structuredDocument,992));
+        assertEquals("myBean.bigIntegerProperty + 4", getELText(_structuredDocument,1072));
+        assertEquals("myBean.bigIntegerProperty + 5.5", getELText(_structuredDocument,1134));
+        assertEquals("myBean.bigDoubleProperty + 5.5", getELText(_structuredDocument,1198));
+        assertEquals("myBean.doubleProperty + 5", getELText(_structuredDocument,1261));
 
-        assertEquals("5 + true", getELText(_structuredDocument,1651));
-        assertEquals("myBean.integerProperty + myBean.booleanProperty", getELText(_structuredDocument,1690));
-        assertEquals("myBean.stringArrayProperty + myBean.booleanProperty", getELText(_structuredDocument,1768));
-        assertEquals("myBean.integerProperty + true ", getELText(_structuredDocument,1853));
-        assertEquals("'a' + 'b'", getELText(_structuredDocument,1917));
-        assertEquals("myBean.bigIntegerProperty + true", getELText(_structuredDocument,1960));
+        assertEquals("5 + 3", getELText(_structuredDocument,1343));
+        assertEquals("5.5 + 4", getELText(_structuredDocument,1378));
+        assertEquals("5.5 + null", getELText(_structuredDocument,1415));
+        assertEquals("'5' + '4'", getELText(_structuredDocument,1458));
+        assertEquals("null + null", getELText(_structuredDocument,1500));
+        assertEquals("5.5 + 3.5", getELText(_structuredDocument,1545));
+
+        assertEquals("5 + true", getELText(_structuredDocument,1605));
+        assertEquals("myBean.integerProperty + myBean.booleanProperty", getELText(_structuredDocument,1643));
+        assertEquals("myBean.stringArrayProperty + myBean.booleanProperty", getELText(_structuredDocument,1720));
+        assertEquals("myBean.integerProperty + true ", getELText(_structuredDocument,1804));
+        assertEquals("'a' + 'b'", getELText(_structuredDocument,1867));
+        assertEquals("myBean.bigIntegerProperty + true", getELText(_structuredDocument,1909));
     }
-    
+
+    @Override
     public void testNoErrorExprs()
     {
-        assertNoError(900, Signature.SIG_LONG);
-        assertNoError(961, Signature.SIG_LONG);
-        assertNoError(1020, Signature.SIG_LONG);
-        assertNoError(1101, TypeConstants.TYPE_BIG_INTEGER);
-        assertNoError(1164, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1229, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1293, Signature.SIG_DOUBLE);
+        assertNoError(874, Signature.SIG_LONG);
+        assertNoError(934, Signature.SIG_LONG);
+        assertNoError(992, Signature.SIG_LONG);
+        assertNoError(1072, TypeConstants.TYPE_BIG_INTEGER);
+        assertNoError(1134, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1198, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1261, Signature.SIG_DOUBLE);
     }
 
+    @Override
     public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1381, Signature.SIG_LONG, 1);
+        List<IMessage> list = assertSemanticWarning(1343, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1417, Signature.SIG_DOUBLE,  1);
+        list = assertSemanticWarning(1378, Signature.SIG_DOUBLE,  1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(1455, Signature.SIG_DOUBLE, 1);
+
+        list = assertSemanticWarning(1415, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(1499, Signature.SIG_LONG,  1);
+
+        list = assertSemanticWarning(1458, Signature.SIG_LONG,  1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(1542, Signature.SIG_LONG,  1);
+
+        list = assertSemanticWarning(1500, Signature.SIG_LONG,  1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID);
-        
-        list = assertSemanticWarning(1588, Signature.SIG_DOUBLE, 1);
+
+        list = assertSemanticWarning(1545, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
     }
-    
+
+    @Override
     public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(1651, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(1690, null, 1);
+        List<IMessage> list = assertSemanticError(1605, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1768, null, 1);
+        list = assertSemanticError(1643, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-       
-        list = assertSemanticError(1853, null, 1);
+
+        list = assertSemanticError(1720, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(1917, null, 1);
+
+        list = assertSemanticError(1804, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
+
+        list = assertSemanticError(1867, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_COERCE_LITERALS_TO_NUMBERS_ID);
 
-        list = assertSemanticError(1960, null, 1);
+        list = assertSemanticError(1909, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 }
\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticDivideTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticDivideTestCase.java
index eb1c731..3f6304a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticDivideTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticDivideTestCase.java
@@ -15,157 +15,161 @@
  * @author cbateman
  *
  */
-public class ArithmeticDivideTestCase extends SingleJSPTestCase 
+public class ArithmeticDivideTestCase extends SingleJSPTestCase
 {
-    public ArithmeticDivideTestCase() 
+    public ArithmeticDivideTestCase()
     {
         super("/testdata/jsps/arithmeticDivide.jsp.data", "/WEB-INF/arithmeticDivide.jsp", JSFVersion.V1_1, FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("myBean.integerProperty / 3", getELText(_structuredDocument,852));
-        assertEquals("myBean.integerProperty div 3", getELText(_structuredDocument,912));
-        assertEquals("myBean.stringProperty / 3", getELText(_structuredDocument,974));
-        assertEquals("myBean.stringProperty div 3", getELText(_structuredDocument,1033));
-        assertEquals("myBean.integerProperty / myBean.integerProperty", getELText(_structuredDocument,1094));
-        assertEquals("myBean.integerProperty div myBean.integerProperty", getELText(_structuredDocument,1175));
-        assertEquals("myBean.bigIntegerProperty / 4", getELText(_structuredDocument,1258));
-        assertEquals("myBean.bigIntegerProperty / 5.5", getELText(_structuredDocument,1321));
-        assertEquals("myBean.bigDoubleProperty / 5.5", getELText(_structuredDocument,1386));
-        assertEquals("myBean.doubleProperty / 5", getELText(_structuredDocument,1450));
+        assertEquals("myBean.integerProperty / 3", getELText(_structuredDocument,828));
+        assertEquals("myBean.integerProperty div 3", getELText(_structuredDocument,887));
+        assertEquals("myBean.stringProperty / 3", getELText(_structuredDocument,948));
+        assertEquals("myBean.stringProperty div 3", getELText(_structuredDocument,1006));
+        assertEquals("myBean.integerProperty / myBean.integerProperty", getELText(_structuredDocument,1066));
+        assertEquals("myBean.integerProperty div myBean.integerProperty", getELText(_structuredDocument,1146));
+        assertEquals("myBean.bigIntegerProperty / 4", getELText(_structuredDocument,1228));
+        assertEquals("myBean.bigIntegerProperty / 5.5", getELText(_structuredDocument,1290));
+        assertEquals("myBean.bigDoubleProperty / 5.5", getELText(_structuredDocument,1354));
+        assertEquals("myBean.doubleProperty / 5", getELText(_structuredDocument,1417));
 
-        assertEquals("5 / 3", getELText(_structuredDocument,1542));
-        assertEquals("5 div 3", getELText(_structuredDocument,1578));
-        assertEquals("5.5 / 4", getELText(_structuredDocument,1616));
-        assertEquals("5.5 div 4", getELText(_structuredDocument,1654));
-        assertEquals("'5' / '4'", getELText(_structuredDocument,1697));
-        assertEquals("'5' div '4'", getELText(_structuredDocument,1740));
-        assertEquals("null / null", getELText(_structuredDocument,1785));
-        assertEquals("null div null", getELText(_structuredDocument,1830));
-        assertEquals("5.5 / 3.5", getELText(_structuredDocument,1877));
+        assertEquals("5 / 3", getELText(_structuredDocument,1505));
+        assertEquals("5 div 3", getELText(_structuredDocument,1540));
+        assertEquals("5.5 / 4", getELText(_structuredDocument,1577));
+        assertEquals("5.5 div 4", getELText(_structuredDocument,1614));
+        assertEquals("'5' / '4'", getELText(_structuredDocument,1656));
+        assertEquals("'5' div '4'", getELText(_structuredDocument,1698));
+        assertEquals("null / null", getELText(_structuredDocument,1742));
+        assertEquals("null div null", getELText(_structuredDocument,1786));
+        assertEquals("5.5 / 3.5", getELText(_structuredDocument,1832));
 
-        assertEquals("5 / true", getELText(_structuredDocument,1945));
-        assertEquals("5 div true", getELText(_structuredDocument,1984));
-        assertEquals("myBean.integerProperty / myBean.booleanProperty", getELText(_structuredDocument,2025));
-        assertEquals("myBean.integerProperty div myBean.booleanProperty", getELText(_structuredDocument,2103));
-        assertEquals("myBean.stringArrayProperty / myBean.booleanProperty", getELText(_structuredDocument,2183));
-        assertEquals("myBean.integerProperty div myBean.booleanProperty", getELText(_structuredDocument,2265));
-        assertEquals("myBean.integerProperty / true ", getELText(_structuredDocument,2348));
-        assertEquals("myBean.integerProperty div true ", getELText(_structuredDocument,2412));
-        assertEquals("'a' / 'b'", getELText(_structuredDocument,2478));
-        assertEquals("'a' div 'b'", getELText(_structuredDocument,2521));
-        assertEquals("5.5 / null", getELText(_structuredDocument,2563));
-        assertEquals("5.5 div null", getELText(_structuredDocument,2604));
-        assertEquals("5/0", getELText(_structuredDocument,2647));
-        assertEquals("5 div 0", getELText(_structuredDocument,2681));
-        assertEquals("myBean.bigIntegerProperty + true", getELText(_structuredDocument,2719));
-        assertEquals("myBean.bigDoubleProperty / null", getELText(_structuredDocument,2782));
-        assertEquals("myBean.bigDoubleProperty div true", getELText(_structuredDocument,2844));
+        assertEquals("5 / true", getELText(_structuredDocument,1897));
+        assertEquals("5 div true", getELText(_structuredDocument,1935));
+        assertEquals("myBean.integerProperty / myBean.booleanProperty", getELText(_structuredDocument,1975));
+        assertEquals("myBean.integerProperty div myBean.booleanProperty", getELText(_structuredDocument,2052));
+        assertEquals("myBean.stringArrayProperty / myBean.booleanProperty", getELText(_structuredDocument,2131));
+        assertEquals("myBean.integerProperty div myBean.booleanProperty", getELText(_structuredDocument,2212));
+        assertEquals("myBean.integerProperty / true ", getELText(_structuredDocument,2294));
+        assertEquals("myBean.integerProperty div true ", getELText(_structuredDocument,2357));
+        assertEquals("'a' / 'b'", getELText(_structuredDocument,2422));
+        assertEquals("'a' div 'b'", getELText(_structuredDocument,2464));
+        assertEquals("5.5 / null", getELText(_structuredDocument,2505));
+        assertEquals("5.5 div null", getELText(_structuredDocument,2545));
+        assertEquals("5/0", getELText(_structuredDocument,2587));
+        assertEquals("5 div 0", getELText(_structuredDocument,2620));
+        assertEquals("myBean.bigIntegerProperty + true", getELText(_structuredDocument,2657));
+        assertEquals("myBean.bigDoubleProperty / null", getELText(_structuredDocument,2719));
+        assertEquals("myBean.bigDoubleProperty div true", getELText(_structuredDocument,2780));
     }
-    
+
+    @Override
     public void testNoErrorExprs()
     {
-        assertNoError(852, Signature.SIG_DOUBLE);
-        assertNoError(912, Signature.SIG_DOUBLE);
-        assertNoError(974, Signature.SIG_DOUBLE);
-        assertNoError(1033, Signature.SIG_DOUBLE);
-        assertNoError(1094, Signature.SIG_DOUBLE);
-        assertNoError(1175, Signature.SIG_DOUBLE);
-        assertNoError(1258, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1321, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1386, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1450, Signature.SIG_DOUBLE);
+        assertNoError(828, Signature.SIG_DOUBLE);
+        assertNoError(887, Signature.SIG_DOUBLE);
+        assertNoError(948, Signature.SIG_DOUBLE);
+        assertNoError(1006, Signature.SIG_DOUBLE);
+        assertNoError(1066, Signature.SIG_DOUBLE);
+        assertNoError(1146, Signature.SIG_DOUBLE);
+        assertNoError(1228, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1290, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1354, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1417, Signature.SIG_DOUBLE);
     }
-    
+
+    @Override
     public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1542, Signature.SIG_DOUBLE, 1);
+        List<IMessage> list = assertSemanticWarning(1505, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1578, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1540, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1616, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1577, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1654, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1614, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1697, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1656, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1740, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1698, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1785, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1742, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID);
 
-        list = assertSemanticWarning(1830, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1786, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID);
-        
-        list = assertSemanticWarning(1877, Signature.SIG_DOUBLE, 1);
+
+        list = assertSemanticWarning(1832, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
     }
-    
+
+    @Override
     public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(1945, null, 1);
+        List<IMessage> list = assertSemanticError(1897, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1984, null, 1);
+        list = assertSemanticError(1935, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2025, null, 1);
+        list = assertSemanticError(1975, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2103, null, 1);
+        list = assertSemanticError(2052, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2183, null, 1);
+        list = assertSemanticError(2131, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2265, null, 1);
+        list = assertSemanticError(2212, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2348, null, 1);
+        list = assertSemanticError(2294, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2412, null, 1);
+        list = assertSemanticError(2357, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2478, null, 1);
+        list = assertSemanticError(2422, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2521, null, 1);
+        list = assertSemanticError(2464, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2563, null, 1);
+        list = assertSemanticError(2505, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
 
-        list = assertSemanticError(2604, null, 1);
+        list = assertSemanticError(2545, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
 
-        list = assertSemanticError(2647, null, 1);
+        list = assertSemanticError(2587, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
 
-        list = assertSemanticError(2681, null, 1);
+        list = assertSemanticError(2620, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
-        
+
+        list = assertSemanticError(2657, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
+
         list = assertSemanticError(2719, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-
-        list = assertSemanticError(2782, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
 
-        list = assertSemanticError(2844, null, 1);
+        list = assertSemanticError(2780, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticMinusTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticMinusTestCase.java
index bb2da7e..ae96830 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticMinusTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticMinusTestCase.java
@@ -17,93 +17,98 @@
  */
 public class ArithmeticMinusTestCase extends SingleJSPTestCase
 {
-    public ArithmeticMinusTestCase() 
+    public ArithmeticMinusTestCase()
     {
         super("/testdata/jsps/arithmeticMinus.jsp.data", "/WEB-INF/arithmeticMinus.jsp", JSFVersion.V1_1, FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("myBean.integerProperty - 3", getELText(_structuredDocument,852));
-        assertEquals("myBean.stringProperty - 3", getELText(_structuredDocument,912));
-        assertEquals("myBean.integerProperty - myBean.integerProperty", getELText(_structuredDocument,971));
-        assertEquals("myBean.bigIntegerProperty - 4", getELText(_structuredDocument,1052));
-        assertEquals("myBean.bigIntegerProperty - 5.5", getELText(_structuredDocument,1115));
-        assertEquals("myBean.bigDoubleProperty - 5.5", getELText(_structuredDocument,1180));
-        assertEquals("myBean.doubleProperty - 5", getELText(_structuredDocument,1244));
 
-        assertEquals("5 - 3", getELText(_structuredDocument,1336));
-        assertEquals("5.5 - 4", getELText(_structuredDocument,1372));
-        assertEquals("5.5 - null", getELText(_structuredDocument,1410));
-        assertEquals("'5' - '4'", getELText(_structuredDocument,1454));
-        assertEquals("null - null", getELText(_structuredDocument,1497));
-        assertEquals("5.5 - 3.5", getELText(_structuredDocument,1543));
+        assertEquals("myBean.integerProperty - 3", getELText(_structuredDocument,828));
+        assertEquals("myBean.stringProperty - 3", getELText(_structuredDocument,887));
+        assertEquals("myBean.integerProperty - myBean.integerProperty", getELText(_structuredDocument,945));
+        assertEquals("myBean.bigIntegerProperty - 4", getELText(_structuredDocument,1025));
+        assertEquals("myBean.bigIntegerProperty - 5.5", getELText(_structuredDocument,1087));
+        assertEquals("myBean.bigDoubleProperty - 5.5", getELText(_structuredDocument,1151));
+        assertEquals("myBean.doubleProperty - 5", getELText(_structuredDocument,1214));
 
-        assertEquals("5 - true", getELText(_structuredDocument,1606));
-        assertEquals("myBean.integerProperty - myBean.booleanProperty", getELText(_structuredDocument,1645));
-        assertEquals("myBean.stringArrayProperty - myBean.booleanProperty", getELText(_structuredDocument,1723));
-        assertEquals("myBean.integerProperty - true ", getELText(_structuredDocument,1808));
-        assertEquals("'a' - 'b'", getELText(_structuredDocument,1872));
-        assertEquals("myBean.bigIntegerProperty - true", getELText(_structuredDocument,1915));
+        assertEquals("5 - 3", getELText(_structuredDocument,1302));
+        assertEquals("5.5 - 4", getELText(_structuredDocument,1337));
+        assertEquals("5.5 - null", getELText(_structuredDocument,1374));
+        assertEquals("'5' - '4'", getELText(_structuredDocument,1417));
+        assertEquals("null - null", getELText(_structuredDocument,1459));
+        assertEquals("5.5 - 3.5", getELText(_structuredDocument,1504));
+
+        assertEquals("5 - true", getELText(_structuredDocument,1564));
+        assertEquals("myBean.integerProperty - myBean.booleanProperty", getELText(_structuredDocument,1602));
+        assertEquals("myBean.stringArrayProperty - myBean.booleanProperty", getELText(_structuredDocument,1679));
+        assertEquals("myBean.integerProperty - true ", getELText(_structuredDocument,1763));
+        assertEquals("'a' - 'b'", getELText(_structuredDocument,1826));
+        assertEquals("myBean.bigIntegerProperty - true", getELText(_structuredDocument,1868));
     }
-    
+
+    @Override
     public void testNoErrorExprs()
     {
-        assertNoError(852, Signature.SIG_LONG);
-        assertNoError(912, Signature.SIG_LONG);
-        assertNoError(971, Signature.SIG_LONG);
-        assertNoError(1052, TypeConstants.TYPE_BIG_INTEGER);
-        assertNoError(1115, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1180, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1244, Signature.SIG_DOUBLE);
+        assertNoError(828, Signature.SIG_LONG);
+        assertNoError(887, Signature.SIG_LONG);
+        assertNoError(945, Signature.SIG_LONG);
+        assertNoError(1025, TypeConstants.TYPE_BIG_INTEGER);
+        assertNoError(1087, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1151, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1214, Signature.SIG_DOUBLE);
     }
-    
+
+    @Override
     public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1336, Signature.SIG_LONG, 1);
+        List<IMessage> list = assertSemanticWarning(1302, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1372, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1337, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1410, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1374, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1454, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1417, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1497, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1459, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID);
-        
-        list = assertSemanticWarning(1543, Signature.SIG_DOUBLE, 1);
+
+        list = assertSemanticWarning(1504, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
     }
-    
+
+    @Override
     public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(1606, null, 1);
+        List<IMessage> list = assertSemanticError(1564, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1645, null, 1);
+        list = assertSemanticError(1602, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1723, null, 1);
+        list = assertSemanticError(1679, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1808, null, 1);
+        list = assertSemanticError(1763, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1872, null, 1);
+        list = assertSemanticError(1826, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_COERCE_LITERALS_TO_NUMBERS_ID);
-        
-        list = assertSemanticError(1915, null, 1);
+
+        list = assertSemanticError(1868, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticModuloTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticModuloTestCase.java
index bdc47b5..12b2395 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticModuloTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticModuloTestCase.java
@@ -14,151 +14,157 @@
  * @author cbateman
  *
  */
-public class ArithmeticModuloTestCase extends SingleJSPTestCase 
+public class ArithmeticModuloTestCase extends SingleJSPTestCase
 {
-    public ArithmeticModuloTestCase() 
+    public ArithmeticModuloTestCase()
     {
         super("/testdata/jsps/arithmeticModulo.jsp.data", "/WEB-INF/arithmeticModulo.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("myBean.integerProperty % 3", getELText(_structuredDocument,852));
-        assertEquals("myBean.integerProperty mod 3", getELText(_structuredDocument,912));
-        assertEquals("myBean.stringProperty % 3", getELText(_structuredDocument,974));
-        assertEquals("myBean.stringProperty mod 3", getELText(_structuredDocument,1033));
-        assertEquals("myBean.integerProperty % myBean.integerProperty", getELText(_structuredDocument,1094));
-        assertEquals("myBean.integerProperty mod myBean.integerProperty", getELText(_structuredDocument,1175));
-        assertEquals("myBean.bigIntegerProperty mod 4", getELText(_structuredDocument,1258));
-        assertEquals("myBean.doubleProperty mod 4", getELText(_structuredDocument,1323));
-        assertEquals("myBean.doubleProperty mod 5.43", getELText(_structuredDocument,1383));
 
-        assertEquals("5 % 3", getELText(_structuredDocument,1472));
-        assertEquals("5 mod 3", getELText(_structuredDocument,1508));
-        assertEquals("5.5 % 4 ", getELText(_structuredDocument,1546));
-        assertEquals("5.5 mod 4 ", getELText(_structuredDocument,1585));
-        assertEquals("'5' % '4'", getELText(_structuredDocument,1629));
-        assertEquals("'5' mod '4'", getELText(_structuredDocument,1672));
-        assertEquals("null % null", getELText(_structuredDocument,1717));
-        assertEquals("null mod null", getELText(_structuredDocument,1762));
+        assertEquals("myBean.integerProperty % 3", getELText(_structuredDocument,828));
+        assertEquals("myBean.integerProperty mod 3", getELText(_structuredDocument,887));
+        assertEquals("myBean.stringProperty % 3", getELText(_structuredDocument,948));
+        assertEquals("myBean.stringProperty mod 3", getELText(_structuredDocument,1006));
+        assertEquals("myBean.integerProperty % myBean.integerProperty", getELText(_structuredDocument,1066));
+        assertEquals("myBean.integerProperty mod myBean.integerProperty", getELText(_structuredDocument,1146));
+        assertEquals("myBean.bigIntegerProperty mod 4", getELText(_structuredDocument,1228));
+        assertEquals("myBean.doubleProperty mod 4", getELText(_structuredDocument,1292));
+        assertEquals("myBean.doubleProperty mod 5.43", getELText(_structuredDocument,1351));
 
-        assertEquals("5 % true", getELText(_structuredDocument,1829));
-        assertEquals("5 mod true", getELText(_structuredDocument,1868));
-        assertEquals("myBean.stringArrayProperty % myBean.booleanProperty", getELText(_structuredDocument,1909));
-        assertEquals("myBean.stringArrayProperty mod myBean.booleanProperty", getELText(_structuredDocument,1991));
-        assertEquals("myBean.integerProperty % true ", getELText(_structuredDocument,2078));
-        assertEquals("myBean.integerProperty mod true ", getELText(_structuredDocument,2142));
-        assertEquals("'a' % 'b'", getELText(_structuredDocument,2208));
-        assertEquals("'a' mod 'b'", getELText(_structuredDocument,2251));
-        assertEquals("5.5 % null", getELText(_structuredDocument,2293));
-        assertEquals("5.5 mod null", getELText(_structuredDocument,2334));
-        assertEquals("5%0", getELText(_structuredDocument,2377));
-        assertEquals("5 mod 0", getELText(_structuredDocument,2411));
-        assertEquals("myBean.integerProperty % myBean.booleanProperty", getELText(_structuredDocument,2449));
-        assertEquals("myBean.integerProperty mod myBean.booleanProperty", getELText(_structuredDocument,2527));
-        assertEquals("myBean.bigIntegerProperty % myBean.booleanProperty", getELText(_structuredDocument,2607));
+        assertEquals("5 % 3", getELText(_structuredDocument,1437));
+        assertEquals("5 mod 3", getELText(_structuredDocument,1472));
+        assertEquals("5.5 % 4 ", getELText(_structuredDocument,1509));
+        assertEquals("5.5 mod 4 ", getELText(_structuredDocument,1547));
+        assertEquals("'5' % '4'", getELText(_structuredDocument,1590));
+        assertEquals("'5' mod '4'", getELText(_structuredDocument,1632));
+        assertEquals("null % null", getELText(_structuredDocument,1676));
+        assertEquals("null mod null", getELText(_structuredDocument,1720));
+
+        assertEquals("5 % true", getELText(_structuredDocument,1784));
+        assertEquals("5 mod true", getELText(_structuredDocument,1822));
+        assertEquals("myBean.stringArrayProperty % myBean.booleanProperty", getELText(_structuredDocument,1862));
+        assertEquals("myBean.stringArrayProperty mod myBean.booleanProperty", getELText(_structuredDocument,1943));
+        assertEquals("myBean.integerProperty % true ", getELText(_structuredDocument,2029));
+        assertEquals("myBean.integerProperty mod true ", getELText(_structuredDocument,2092));
+        assertEquals("'a' % 'b'", getELText(_structuredDocument,2157));
+        assertEquals("'a' mod 'b'", getELText(_structuredDocument,2199));
+        assertEquals("5.5 % null", getELText(_structuredDocument,2240));
+        assertEquals("5.5 mod null", getELText(_structuredDocument,2280));
+        assertEquals("5%0", getELText(_structuredDocument,2322));
+        assertEquals("5 mod 0", getELText(_structuredDocument,2355));
+        assertEquals("myBean.integerProperty % myBean.booleanProperty", getELText(_structuredDocument,2392));
+        assertEquals("myBean.integerProperty mod myBean.booleanProperty", getELText(_structuredDocument,2469));
+        assertEquals("myBean.bigIntegerProperty % myBean.booleanProperty", getELText(_structuredDocument,2548));
+        assertEquals("myBean.bigIntegerProperty mod null", getELText(_structuredDocument,2628));
+        assertEquals("myBean.doubleProperty % true", getELText(_structuredDocument,2691));
     }
-    
+
+    @Override
     public void testNoErrorExprs()
     {
-        assertNoError(852,Signature.SIG_LONG);
-        assertNoError(912, Signature.SIG_LONG);
-        assertNoError(974, Signature.SIG_LONG);
-        assertNoError(1033, Signature.SIG_LONG);
-        assertNoError(1094, Signature.SIG_LONG);
-        assertNoError(1175, Signature.SIG_LONG);
-        assertNoError(1258, TypeConstants.TYPE_BIG_INTEGER);
-        assertNoError(1323, Signature.SIG_DOUBLE);
-        assertNoError(1383, Signature.SIG_DOUBLE);
-
+        assertNoError(828,Signature.SIG_LONG);
+        assertNoError(887, Signature.SIG_LONG);
+        assertNoError(948, Signature.SIG_LONG);
+        assertNoError(1006, Signature.SIG_LONG);
+        assertNoError(1066, Signature.SIG_LONG);
+        assertNoError(1146, Signature.SIG_LONG);
+        assertNoError(1228, TypeConstants.TYPE_BIG_INTEGER);
+        assertNoError(1292, Signature.SIG_DOUBLE);
+        assertNoError(1351, Signature.SIG_DOUBLE);
     }
-    
+
+    @Override
     public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1472, Signature.SIG_LONG, 1);
+        List<IMessage> list = assertSemanticWarning(1437, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1508, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1472, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1546, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1509, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1585, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1547, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1629, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1590, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(1672, Signature.SIG_LONG, 1);
+
+        list = assertSemanticWarning(1632, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(1717, Signature.SIG_LONG, 1);
+
+        list = assertSemanticWarning(1676, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID);
-        
-        list = assertSemanticWarning(1762, Signature.SIG_LONG, 1);
+
+        list = assertSemanticWarning(1720, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID);
-        
+
     }
 
+    @Override
     public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(1829, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(1868, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(1909, null, 1);
+        List<IMessage> list = assertSemanticError(1784, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1991, null, 1);
+        list = assertSemanticError(1822, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2078, null, 1);
+        list = assertSemanticError(1862, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2142, null, 1);
+        list = assertSemanticError(1943, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2208, null, 1);
+        list = assertSemanticError(2029, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2251, null, 1);
+        list = assertSemanticError(2092, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2293, null, 1);
+        list = assertSemanticError(2157, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
+
+        list = assertSemanticError(2199, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
+
+        list = assertSemanticError(2240, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
 
-        list = assertSemanticError(2334, null, 1);
+        list = assertSemanticError(2280, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
 
-        list = assertSemanticError(2377, null, 1);
+        list = assertSemanticError(2322, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
 
-        list = assertSemanticError(2411, null, 1);
+        list = assertSemanticError(2355, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
-        
-        list = assertSemanticError(2449, null, 1);
+
+        list = assertSemanticError(2392, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2527, null, 1);
+        list = assertSemanticError(2469, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2607, null, 1);
+        list = assertSemanticError(2548, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2688, null, 1);
+        list = assertSemanticError(2628, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID);
 
-        list = assertSemanticError(2752, null, 1);
+        list = assertSemanticError(2691, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticMultiplyTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticMultiplyTestCase.java
index 58fa757..dab4e7c 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticMultiplyTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ArithmeticMultiplyTestCase.java
@@ -15,95 +15,99 @@
  * @author cbateman
  *
  */
-public class ArithmeticMultiplyTestCase extends SingleJSPTestCase 
+public class ArithmeticMultiplyTestCase extends SingleJSPTestCase
 {
-    public ArithmeticMultiplyTestCase() 
+    public ArithmeticMultiplyTestCase()
     {
         super("/testdata/jsps/arithmeticMultiply.jsp.data", "/WEB-INF/arithmeticMultiply.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("myBean.integerProperty * 3", getELText(_structuredDocument,852));
-        assertEquals("myBean.stringProperty * 3", getELText(_structuredDocument,912));
-        assertEquals("myBean.integerProperty * myBean.integerProperty", getELText(_structuredDocument,971));
-        assertEquals("myBean.bigIntegerProperty * 4", getELText(_structuredDocument,1052));
-        assertEquals("myBean.bigIntegerProperty * 5.5", getELText(_structuredDocument,1115));
-        assertEquals("myBean.bigDoubleProperty * 5.5", getELText(_structuredDocument,1180));
-        assertEquals("myBean.doubleProperty * 5", getELText(_structuredDocument,1244));
-        
-        assertEquals("5 * 3", getELText(_structuredDocument,1336));
-        assertEquals("5.5 * 4", getELText(_structuredDocument,1372));
-        assertEquals("5.5 * null", getELText(_structuredDocument,1410));
-        assertEquals("'5' * '4'", getELText(_structuredDocument,1454));
-        assertEquals("null * null", getELText(_structuredDocument,1497));
-        assertEquals("5.5 * 3.5", getELText(_structuredDocument,1543));
+        assertEquals("myBean.integerProperty * 3", getELText(_structuredDocument,828));
+        assertEquals("myBean.stringProperty * 3", getELText(_structuredDocument,887));
+        assertEquals("myBean.integerProperty * myBean.integerProperty", getELText(_structuredDocument,945));
+        assertEquals("myBean.bigIntegerProperty * 4", getELText(_structuredDocument,1025));
+        assertEquals("myBean.bigIntegerProperty * 5.5", getELText(_structuredDocument,1087));
+        assertEquals("myBean.bigDoubleProperty * 5.5", getELText(_structuredDocument,1151));
+        assertEquals("myBean.doubleProperty * 5", getELText(_structuredDocument,1214));
 
-        assertEquals("5 * true", getELText(_structuredDocument,1609));
-        assertEquals("myBean.integerProperty * myBean.booleanProperty", getELText(_structuredDocument,1648));
-        assertEquals("myBean.stringArrayProperty * myBean.booleanProperty", getELText(_structuredDocument,1726));
-        assertEquals("myBean.integerProperty * true ", getELText(_structuredDocument,1811));
-        assertEquals("'a' * 'b'", getELText(_structuredDocument,1875));
-        assertEquals("myBean.bigIntegerProperty * true", getELText(_structuredDocument,1918));
+        assertEquals("5 * 3", getELText(_structuredDocument,1302));
+        assertEquals("5.5 * 4", getELText(_structuredDocument,1337));
+        assertEquals("5.5 * null", getELText(_structuredDocument,1374));
+        assertEquals("'5' * '4'", getELText(_structuredDocument,1417));
+        assertEquals("null * null", getELText(_structuredDocument,1459));
+        assertEquals("5.5 * 3.5", getELText(_structuredDocument,1504));
+
+        assertEquals("5 * true", getELText(_structuredDocument,1567));
+        assertEquals("myBean.integerProperty * myBean.booleanProperty", getELText(_structuredDocument,1605));
+        assertEquals("myBean.stringArrayProperty * myBean.booleanProperty", getELText(_structuredDocument,1682));
+        assertEquals("myBean.integerProperty * true ", getELText(_structuredDocument,1766));
+        assertEquals("'a' * 'b'", getELText(_structuredDocument,1829));
+        assertEquals("myBean.bigIntegerProperty * true", getELText(_structuredDocument,1871));
     }
-    
+
+    @Override
     public void testNoErrorExprs()
     {
-        assertNoError(852,Signature.SIG_LONG);
-        assertNoError(912,Signature.SIG_LONG);
-        assertNoError(971,Signature.SIG_LONG);
-        assertNoError(1052, TypeConstants.TYPE_BIG_INTEGER);
-        assertNoError(1115, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1180, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1244, Signature.SIG_DOUBLE);
+        assertNoError(828,Signature.SIG_LONG);
+        assertNoError(887,Signature.SIG_LONG);
+        assertNoError(945,Signature.SIG_LONG);
+        assertNoError(1025, TypeConstants.TYPE_BIG_INTEGER);
+        assertNoError(1087, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1151, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(1214, Signature.SIG_DOUBLE);
     }
-    
+
+    @Override
     public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1336, Signature.SIG_LONG, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(1372, Signature.SIG_DOUBLE, 1);
+        List<IMessage> list = assertSemanticWarning(1302, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1410, Signature.SIG_DOUBLE, 1);
+        list = assertSemanticWarning(1337, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1454, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1374, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1497, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1417, Signature.SIG_LONG, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
+
+        list = assertSemanticWarning(1459, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID);
-        
-        list = assertSemanticWarning(1543, Signature.SIG_DOUBLE, 1);
+
+        list = assertSemanticWarning(1504, Signature.SIG_DOUBLE, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
     }
-    
+
+    @Override
     public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(1609, null, 1);
+        List<IMessage> list = assertSemanticError(1567, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1648, null, 1);
+        list = assertSemanticError(1605, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1726, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(1811, null, 1);
+        list = assertSemanticError(1682, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1875, null, 1);
+        list = assertSemanticError(1766, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
+
+        list = assertSemanticError(1829, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_COERCE_LITERALS_TO_NUMBERS_ID);
-        
-        list = assertSemanticError(1918, null, 1);
+
+        list = assertSemanticError(1871, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/AssignabilityTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/AssignabilityTestCase.java
index 3a41726..089e94d 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/AssignabilityTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/AssignabilityTestCase.java
@@ -11,45 +11,51 @@
  * 
  * @author cbateman
  */
-public class AssignabilityTestCase extends SingleJSPTestCase 
+public class AssignabilityTestCase extends SingleJSPTestCase
 {
-    public AssignabilityTestCase() 
+    public AssignabilityTestCase()
     {
         super("/testdata/jsps/assignability.jsp.data", "/assignability.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("myBean.integerProperty + 3", getELText(_structuredDocument,906));
-        assertEquals("myBean.writableStringProperty", getELText(_structuredDocument,965));
-        assertEquals("myBean.stringProperty", getELText(_structuredDocument,1025));
-        assertEquals("bundle.bundleProp2", getELText(_structuredDocument,1076));
-        assertEquals("requestScope.myBeanSubClass", getELText(_structuredDocument,1127));
-    }
-    
-    public void testNoErrorExprs() 
-    {
-        assertNoError(906, Signature.SIG_LONG, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(965, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(1025, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1076, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1127, "Lbeans.MyBeanSubClass;", IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        // TODO: this will fail when the jsf-impl/api jars are injected since then we will
-        // have fully resolved (L) signatures instead of (Q) unresolved ones.
-        assertNoError(1187, "(QFacesContext;QUIComponent;Ljava.lang.Object;)V", IAssignable.ASSIGNMENT_TYPE_NONE);
+        assertEquals("myBean.integerProperty + 3", getELText(_structuredDocument,880));
+        assertEquals("myBean.writableStringProperty", getELText(_structuredDocument,938));
+        assertEquals("myBean.stringProperty", getELText(_structuredDocument,997));
+        assertEquals("bundle.bundleProp2", getELText(_structuredDocument,1047));
+        assertEquals("requestScope.myBeanSubClass", getELText(_structuredDocument,1097));
+        assertEquals("myBean.validate", getELText(_structuredDocument,1156));
     }
 
+    @Override
+    public void testNoErrorExprs()
+    {
+        assertNoError(880, Signature.SIG_LONG, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(938, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(997, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1047, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1097, "Lbeans.MyBeanSubClass;", IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        // TODO: this will fail when the jsf-impl/api jars are injected since then we will
+        // have fully resolved (L) signatures instead of (Q) unresolved ones.
+        assertNoError(1156, "(QFacesContext;QUIComponent;Ljava.lang.Object;)V", IAssignable.ASSIGNMENT_TYPE_NONE);
+    }
+
+    @Override
     public void testWarningExprs()
     {
         // no warnings
     }
-    
-    public void testErrorExprs() 
+
+    @Override
+    public void testErrorExprs()
     {
         // no errors
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BadSyntaxTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BadSyntaxTestCase.java
index 107e4b8..78fa0f2 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BadSyntaxTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BadSyntaxTestCase.java
@@ -13,17 +13,19 @@
  * @author cbateman
  *
  */
-public class BadSyntaxTestCase extends SingleJSPTestCase 
+public class BadSyntaxTestCase extends SingleJSPTestCase
 {
     public BadSyntaxTestCase() {
         super("/testdata/jsps/badSyntax.jsp.data", "/badSyntax.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         assertEquals(" ", getELText(_structuredDocument,870));
@@ -34,19 +36,21 @@
     }
 
 
+    @Override
     public void testNoErrorExprs() {
         // no non-error cases
     }
 
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
         List<IMessage> list = assertSyntaxWarning(870,1);
         assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID);
-        
+
         list = assertSyntaxWarning(902,1);
         assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID);
-        
+
         list = assertSyntaxWarning(958,1);
         assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID);
 
@@ -57,7 +61,8 @@
         assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
         // no error cases
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanPropertyResolutionTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanPropertyResolutionTestCase.java
index 044fafa..22d50f1 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanPropertyResolutionTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanPropertyResolutionTestCase.java
@@ -15,7 +15,7 @@
  * 
  * @author cbateman
  */
-public class BeanPropertyResolutionTestCase extends SingleJSPTestCase 
+public class BeanPropertyResolutionTestCase extends SingleJSPTestCase
 {
     public BeanPropertyResolutionTestCase() {
         super("/testdata/jsps/beanPropertyResolution.jsp.data", "/beanPropertyResolution.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
@@ -31,133 +31,138 @@
     {
         super(srcFile,destFile, JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
-    
+
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("myBean.stringProperty", getELText(_structuredDocument,541));
-        assertEquals("myBean.integerProperty", getELText(_structuredDocument,596));
-        assertEquals("myBean.booleanProperty", getELText(_structuredDocument,652));
-        assertEquals("myBean.doubleProperty", getELText(_structuredDocument,708));
-        assertEquals("myBean.mapProperty", getELText(_structuredDocument,763));
-        assertEquals("myBean.stringArrayProperty", getELText(_structuredDocument,815));
-        assertEquals("myBean.collectionProperty", getELText(_structuredDocument,875));
-        assertEquals("myBean.listProperty", getELText(_structuredDocument,934));
-        assertEquals("myBean.comparableProperty", getELText(_structuredDocument,987));
-        assertEquals("myBean.bigIntegerProperty", getELText(_structuredDocument,1046));
-        assertEquals("myBean.bigDoubleProperty", getELText(_structuredDocument,1105));
-        assertEquals("myBean.writableStringProperty", getELText(_structuredDocument,1163));
-        assertEquals("myBean.isStyleBooleanProperty", getELText(_structuredDocument,1226));
-        assertEquals("myBean.colors", getELText(_structuredDocument,1289));
-        assertEquals("myBean.coins", getELText(_structuredDocument,1336));
-        
-        assertEquals("myBeanSubClass.stringProperty", getELText(_structuredDocument,1417));
-        assertEquals("myBeanSubClass.integerProperty", getELText(_structuredDocument,1480));
-        assertEquals("myBeanSubClass.booleanProperty", getELText(_structuredDocument,1544));
-        assertEquals("myBeanSubClass.doubleProperty", getELText(_structuredDocument,1608));
-        assertEquals("myBeanSubClass.mapProperty", getELText(_structuredDocument,1671));
-        assertEquals("myBeanSubClass.stringArrayProperty", getELText(_structuredDocument,1731));
-        assertEquals("myBeanSubClass.collectionProperty", getELText(_structuredDocument,1799));
-        assertEquals("myBeanSubClass.listProperty", getELText(_structuredDocument,1866));
-        assertEquals("myBeanSubClass.comparableProperty", getELText(_structuredDocument,1927));
-        assertEquals("myBeanSubClass.bigIntegerProperty", getELText(_structuredDocument,1994));
-        assertEquals("myBeanSubClass.bigDoubleProperty", getELText(_structuredDocument,2061));
-        assertEquals("myBeanSubClass.writableStringProperty", getELText(_structuredDocument,2127));
-        assertEquals("myBeanSubClass.isStyleBooleanProperty", getELText(_structuredDocument,2198));
-        assertEquals("myBeanSubClass.subClassStringProperty", getELText(_structuredDocument,2269));
-        assertEquals("myBeanSubClass.colors", getELText(_structuredDocument,2340));
-        assertEquals("myBeanSubClass.coins", getELText(_structuredDocument,2395));
+        assertEquals("myBean.stringProperty", getELText(_structuredDocument,523));
+        assertEquals("myBean.integerProperty", getELText(_structuredDocument,577));
+        assertEquals("myBean.booleanProperty", getELText(_structuredDocument,632));
+        assertEquals("myBean.doubleProperty", getELText(_structuredDocument,687));
+        assertEquals("myBean.mapProperty", getELText(_structuredDocument,741));
+        assertEquals("myBean.stringArrayProperty", getELText(_structuredDocument,792));
+        assertEquals("myBean.collectionProperty", getELText(_structuredDocument,851));
+        assertEquals("myBean.listProperty", getELText(_structuredDocument,909));
+        assertEquals("myBean.comparableProperty", getELText(_structuredDocument,961));
+        assertEquals("myBean.bigIntegerProperty", getELText(_structuredDocument,1019));
+        assertEquals("myBean.bigDoubleProperty", getELText(_structuredDocument,1077));
+        assertEquals("myBean.writableStringProperty", getELText(_structuredDocument,1134));
+        assertEquals("myBean.isStyleBooleanProperty", getELText(_structuredDocument,1196));
+        assertEquals("myBean.colors", getELText(_structuredDocument,1258));
+        assertEquals("myBean.coins", getELText(_structuredDocument,1304));
 
-        assertEquals("myBeanSubClass.stringProperty", getELText(_structuredDocument,2478));
-        assertEquals("myBeanSettable.integerProperty", getELText(_structuredDocument,2541));
-        assertEquals("myBeanSettable.booleanProperty", getELText(_structuredDocument,2605));
-        assertEquals("myBeanSettable.doubleProperty", getELText(_structuredDocument,2669));
-        assertEquals("myBeanSettable.mapProperty", getELText(_structuredDocument,2732));
-        assertEquals("myBeanSettable.stringArrayProperty", getELText(_structuredDocument,2792));
-        assertEquals("myBeanSettable.collectionProperty", getELText(_structuredDocument,2860));
-        assertEquals("myBeanSettable.listProperty", getELText(_structuredDocument,2927));
-        assertEquals("myBeanSettable.comparableProperty", getELText(_structuredDocument,2988));
-        assertEquals("myBeanSettable.bigIntegerProperty", getELText(_structuredDocument,3055));
-        assertEquals("myBeanSettable.bigDoubleProperty", getELText(_structuredDocument,3122));
-        assertEquals("myBeanSettable.writableStringProperty", getELText(_structuredDocument,3188));
-        assertEquals("myBeanSettable.isStyleBooleanProperty", getELText(_structuredDocument,3259));
-        assertEquals("myBeanSettable.colors", getELText(_structuredDocument,3330));
-        assertEquals("myBeanSettable.coins", getELText(_structuredDocument,3385));
-        
-        assertEquals("myBean.subClassStringProperty", getELText(_structuredDocument,3468));
-        assertEquals("myBeanSubClass.notAMember", getELText(_structuredDocument,3531));
-        assertEquals("myBeanSettable.alsoNotAMember", getELText(_structuredDocument,3590));
+        assertEquals("myBeanSubClass.stringProperty", getELText(_structuredDocument,1382));
+        assertEquals("myBeanSubClass.integerProperty", getELText(_structuredDocument,1444));
+        assertEquals("myBeanSubClass.booleanProperty", getELText(_structuredDocument,1507));
+        assertEquals("myBeanSubClass.doubleProperty", getELText(_structuredDocument,1570));
+        assertEquals("myBeanSubClass.mapProperty", getELText(_structuredDocument,1632));
+        assertEquals("myBeanSubClass.stringArrayProperty", getELText(_structuredDocument,1691));
+        assertEquals("myBeanSubClass.collectionProperty", getELText(_structuredDocument,1758));
+        assertEquals("myBeanSubClass.listProperty", getELText(_structuredDocument,1824));
+        assertEquals("myBeanSubClass.comparableProperty", getELText(_structuredDocument,1884));
+        assertEquals("myBeanSubClass.bigIntegerProperty", getELText(_structuredDocument,1950));
+        assertEquals("myBeanSubClass.bigDoubleProperty", getELText(_structuredDocument,2016));
+        assertEquals("myBeanSubClass.writableStringProperty", getELText(_structuredDocument,2081));
+        assertEquals("myBeanSubClass.isStyleBooleanProperty", getELText(_structuredDocument,2151));
+        assertEquals("myBeanSubClass.subClassStringProperty", getELText(_structuredDocument,2221));
+        assertEquals("myBeanSubClass.colors", getELText(_structuredDocument,2291));
+        assertEquals("myBeanSubClass.coins", getELText(_structuredDocument,2345));
+
+        assertEquals("myBeanSubClass.stringProperty", getELText(_structuredDocument,2425));
+        assertEquals("myBeanSettable.integerProperty", getELText(_structuredDocument,2487));
+        assertEquals("myBeanSettable.booleanProperty", getELText(_structuredDocument,2550));
+        assertEquals("myBeanSettable.doubleProperty", getELText(_structuredDocument,2613));
+        assertEquals("myBeanSettable.mapProperty", getELText(_structuredDocument,2675));
+        assertEquals("myBeanSettable.stringArrayProperty", getELText(_structuredDocument,2734));
+        assertEquals("myBeanSettable.collectionProperty", getELText(_structuredDocument,2801));
+        assertEquals("myBeanSettable.listProperty", getELText(_structuredDocument,2867));
+        assertEquals("myBeanSettable.comparableProperty", getELText(_structuredDocument,2927));
+        assertEquals("myBeanSettable.bigIntegerProperty", getELText(_structuredDocument,2993));
+        assertEquals("myBeanSettable.bigDoubleProperty", getELText(_structuredDocument,3059));
+        assertEquals("myBeanSettable.writableStringProperty", getELText(_structuredDocument,3124));
+        assertEquals("myBeanSettable.isStyleBooleanProperty", getELText(_structuredDocument,3194));
+        assertEquals("myBeanSettable.colors", getELText(_structuredDocument,3264));
+        assertEquals("myBeanSettable.coins", getELText(_structuredDocument,3318));
+
+        assertEquals("myBean.subClassStringProperty", getELText(_structuredDocument,3398));
+        assertEquals("myBeanSubClass.notAMember", getELText(_structuredDocument,3460));
+        assertEquals("myBeanSettable.alsoNotAMember", getELText(_structuredDocument,3518));
     }
-    
-    public void testNoErrorExprs() 
+
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(541, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(596, Signature.SIG_INT, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(652, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(708, Signature.SIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(763, TypeConstants.TYPE_MAP, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(815, Signature.createArraySignature(TypeConstants.TYPE_STRING, 1), IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(875, TypeConstants.TYPE_COLLECTION, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(934, "Ljava.util.List;", IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(987, TypeConstants.TYPE_COMPARABLE, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1046, TypeConstants.TYPE_BIG_INTEGER, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1105, TypeConstants.TYPE_BIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1163, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(1226, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1289, "Lbeans.MyEnum2;", IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1336, "Lbeans.MyEnum1;", IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(523, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(577, Signature.SIG_INT, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(632, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(687, Signature.SIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(741, TypeConstants.TYPE_MAP, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(792, Signature.createArraySignature(TypeConstants.TYPE_STRING, 1), IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(851, TypeConstants.TYPE_COLLECTION, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(909, "Ljava.util.List;", IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(961, TypeConstants.TYPE_COMPARABLE, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1019, TypeConstants.TYPE_BIG_INTEGER, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1077, TypeConstants.TYPE_BIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1134, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(1196, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1258, "Lbeans.MyEnum2;", IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1304, "Lbeans.MyEnum1;", IAssignable.ASSIGNMENT_TYPE_RHS);
 
-        assertNoError(1417, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1480, Signature.SIG_INT, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1544, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1608, Signature.SIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1671, TypeConstants.TYPE_MAP, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1731, Signature.createArraySignature(TypeConstants.TYPE_STRING, 1), IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1799, TypeConstants.TYPE_COLLECTION, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1866, "Ljava.util.List;", IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1927, TypeConstants.TYPE_COMPARABLE, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(1994, TypeConstants.TYPE_BIG_INTEGER, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(2061, TypeConstants.TYPE_BIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(2127, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(2198, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(2269, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(2340, "Lbeans.MyEnum2;", IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(2395, "Lbeans.MyEnum1;", IAssignable.ASSIGNMENT_TYPE_RHS);
-        
-        assertNoError(2478, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
-        assertNoError(2541, Signature.SIG_INT, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(2605, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(2669, Signature.SIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(2732, TypeConstants.TYPE_MAP, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(2792, Signature.createArraySignature(TypeConstants.TYPE_STRING, 1), IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(2860, TypeConstants.TYPE_COLLECTION, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(2927, "Ljava.util.List;", IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(2988, TypeConstants.TYPE_COMPARABLE, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(3055, TypeConstants.TYPE_BIG_INTEGER, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(3122, TypeConstants.TYPE_BIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(3188, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(3259, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(3330, "Lbeans.MyEnum2;", IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
-        assertNoError(3385, "Lbeans.MyEnum1;", IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(1382, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1444, Signature.SIG_INT, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1507, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1570, Signature.SIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1632, TypeConstants.TYPE_MAP, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1691, Signature.createArraySignature(TypeConstants.TYPE_STRING, 1), IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1758, TypeConstants.TYPE_COLLECTION, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1824, "Ljava.util.List;", IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1884, TypeConstants.TYPE_COMPARABLE, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(1950, TypeConstants.TYPE_BIG_INTEGER, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(2016, TypeConstants.TYPE_BIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(2081, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2151, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(2221, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(2291, "Lbeans.MyEnum2;", IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(2345, "Lbeans.MyEnum1;", IAssignable.ASSIGNMENT_TYPE_RHS);
+
+        assertNoError(2425, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS);
+        assertNoError(2487, Signature.SIG_INT, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2550, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2613, Signature.SIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2675, TypeConstants.TYPE_MAP, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2734, Signature.createArraySignature(TypeConstants.TYPE_STRING, 1), IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2801, TypeConstants.TYPE_COLLECTION, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2867, "Ljava.util.List;", IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2927, TypeConstants.TYPE_COMPARABLE, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(2993, TypeConstants.TYPE_BIG_INTEGER, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(3059, TypeConstants.TYPE_BIG_DOUBLE, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(3124, TypeConstants.TYPE_STRING, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(3194, Signature.SIG_BOOLEAN, IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(3264, "Lbeans.MyEnum2;", IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
+        assertNoError(3318, "Lbeans.MyEnum1;", IAssignable.ASSIGNMENT_TYPE_RHS|IAssignable.ASSIGNMENT_TYPE_LHS);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(3468,null,1);
+        List<IMessage> list = assertSemanticWarning(3398,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3531,null,1);
+        list = assertSemanticWarning(3460,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
-        
-        list = assertSemanticWarning(3590,null,1);
+
+        list = assertSemanticWarning(3518,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
         // no error cases
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanVariableResolutionTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanVariableResolutionTestCase.java
index 0e22163..59202a7 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanVariableResolutionTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanVariableResolutionTestCase.java
@@ -13,52 +13,57 @@
  * @author cbateman
  *
  */
-public class BeanVariableResolutionTestCase extends SingleJSPTestCase 
+public class BeanVariableResolutionTestCase extends SingleJSPTestCase
 {
     public BeanVariableResolutionTestCase() {
         super("/testdata/jsps/beanVariableResolution.jsp.data", "/beanVariableResolution.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("myBean", getELText(_structuredDocument,541));
-        assertEquals("myBeanSubClass", getELText(_structuredDocument,581));
-        assertEquals("mapBean", getELText(_structuredDocument,629));
-        assertEquals("mapBean1", getELText(_structuredDocument,670));
-        assertEquals("hiddenBean", getELText(_structuredDocument,712));
-        assertEquals("myBean_none", getELText(_structuredDocument,756));
-        assertEquals("myBeanSettable", getELText(_structuredDocument,801));
+        assertEquals("myBean", getELText(_structuredDocument,523));
+        assertEquals("myBeanSubClass", getELText(_structuredDocument,562));
+        assertEquals("mapBean", getELText(_structuredDocument,609));
+        assertEquals("mapBean1", getELText(_structuredDocument,649));
+        assertEquals("hiddenBean", getELText(_structuredDocument,690));
+        assertEquals("myBean_none", getELText(_structuredDocument,733));
+        assertEquals("myBeanSettable", getELText(_structuredDocument,777));
 
-        assertEquals("myBean1", getELText(_structuredDocument,878));
-        assertEquals("someOtherBeanName", getELText(_structuredDocument,919));
-    }
-    
-    public void testNoErrorExprs() 
-    {
-        assertNoError(541, "Lbeans.MyBean;");
-        assertNoError(581, "Lbeans.MyBeanSubClass;");
-        assertNoError(629, "Lbeans.MapBean;");
-        assertNoError(670, "Lbeans.MapBean;");
-        assertNoError(712, "Lbeans.MyBean;");
-        assertNoError(756, "Lbeans.MyBean;");
-        assertNoError(801, "Lbeans.MyBeanSettable;");
+        assertEquals("myBean1", getELText(_structuredDocument,851));
+        assertEquals("someOtherBeanName", getELText(_structuredDocument,891));
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        List<IMessage> list = assertSemanticWarning(878, null, 1);
+        assertNoError(523, "Lbeans.MyBean;");
+        assertNoError(562, "Lbeans.MyBeanSubClass;");
+        assertNoError(609, "Lbeans.MapBean;");
+        assertNoError(649, "Lbeans.MapBean;");
+        assertNoError(690, "Lbeans.MyBean;");
+        assertNoError(733, "Lbeans.MyBean;");
+        assertNoError(777, "Lbeans.MyBeanSettable;");
+    }
+
+    @Override
+    public void testWarningExprs()
+    {
+        List<IMessage> list = assertSemanticWarning(851, null, 1);
         assertContainsProblem(list,DiagnosticFactory.VARIABLE_NOT_FOUND_ID);
-        
-        list = assertSemanticWarning(919, null, 1);
+
+        list = assertSemanticWarning(891, null, 1);
         assertContainsProblem(list,DiagnosticFactory.VARIABLE_NOT_FOUND_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
         // no error cases
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BracketOperatorTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BracketOperatorTestCase.java
index 20f9954..31e72a3 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BracketOperatorTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BracketOperatorTestCase.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Cameron Bateman - initial implementation
- *******************************************************************************/ 
+ *******************************************************************************/
 package org.eclipse.jst.jsf.validation.el.tests.jsp;
 
 import java.util.List;
@@ -24,195 +24,206 @@
  * @author cbateman
  *
  */
-public class BracketOperatorTestCase extends SingleJSPTestCase 
+public class BracketOperatorTestCase extends SingleJSPTestCase
 {
-    public BracketOperatorTestCase() 
+    public BracketOperatorTestCase()
     {
         super("/testdata/jsps/bracketOperator.jsp.data", "/bracketOperator.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("bundle['x.y']", getELText(_structuredDocument,841));
-        assertEquals("beanWithMapProperties['integerProperty']", getELText(_structuredDocument,888));
-        assertEquals("bundle['x']", getELText(_structuredDocument,967));
-        assertEquals("beanWithMapProperties.treeMap", getELText(_structuredDocument,1020));
-        assertEquals("beanWithMapProperties.treeMap.foo", getELText(_structuredDocument,1090));
-        assertEquals("beanWithMapProperties['treeMap'].foo", getELText(_structuredDocument,1157));
-        assertEquals("beanWithMapProperties['treeMap']['foo']", getELText(_structuredDocument,1228));
-        assertEquals("beanWithMapProperties.treeMap['foo']", getELText(_structuredDocument,1301));
-        assertEquals("mapBean['foo']", getELText(_structuredDocument,1380));
-        assertEquals("mapBean['foo.x']", getELText(_structuredDocument,1428));
-        assertEquals("mapBean['getIgnoredIntProperty']", getELText(_structuredDocument,1478));
-        assertEquals("beanWithMapProperties['actionProperty']", getELText(_structuredDocument,1548));
-        assertEquals("myBean.stringArrayProperty[0]", getELText(_structuredDocument,1620));
-        assertEquals("myBean.stringArrayProperty[myBean.integerProperty]", getELText(_structuredDocument,1680));
-        assertEquals("myBean.stringArrayProperty['0']", getELText(_structuredDocument,1761));
-        assertEquals("myBean.intArrayProperty[1]", getELText(_structuredDocument,1823));
-        assertEquals("myBean.intArrayProperty[1] > 0", getELText(_structuredDocument,1880));
-        assertEquals("empty myBean.arrayOfArrayOfStringProperty", getELText(_structuredDocument,1941));
-        assertEquals("empty myBean.arrayOfArrayOfStringProperty[1]", getELText(_structuredDocument,2013));
-        assertEquals("myBean.arrayOfArrayOfStringProperty[0][1]", getELText(_structuredDocument,2088));
-        assertEquals("myBean.arrayOfArrayOfStringProperty[myBean.intArrayProperty[0]][myBean.intArrayProperty[1]]", getELText(_structuredDocument,2160));
-        assertEquals("beanWithListProperties.listProperty[0]", getELText(_structuredDocument,2284));
-        assertEquals("beanWithListProperties.listProperty[myBean.integerProperty]", getELText(_structuredDocument,2353));
-        assertEquals("beanWithListProperties.listProperty['0']", getELText(_structuredDocument,2443));
-        assertEquals("beanWithListProperties.listProperty['0'].someValue", getELText(_structuredDocument,2514));
-        assertEquals("beanWithListProperties.arrayListProperty[0]", getELText(_structuredDocument,2595));
-        assertEquals("beanWithListProperties.arrayListProperty[myBean.integerProperty]", getELText(_structuredDocument,2669));
-        assertEquals("beanWithListProperties.arrayListProperty['0']", getELText(_structuredDocument,2764));
-        assertEquals("beanWithListProperties.arrayListProperty['0'].someValue", getELText(_structuredDocument,2840));
-        assertEquals("listBean[0]", getELText(_structuredDocument,2930));
-        assertEquals("listBean[myBean.integerProperty]", getELText(_structuredDocument,2972));
-        assertEquals("listBean['0']", getELText(_structuredDocument,3035));
-        assertEquals("listBean['0'].someValue", getELText(_structuredDocument,3079));
 
-        assertEquals("bundle['y']", getELText(_structuredDocument,3160));
-        assertEquals("bundle['x.z']", getELText(_structuredDocument,3205));
-        assertEquals("beanWithMapProperties['actionProperty.foo']", getELText(_structuredDocument,3252));
-        assertEquals("beanWithMapProperties['treeMap.foo']", getELText(_structuredDocument,3329));
-        assertEquals("beanWithMapProperties['mapProperty.foo']", getELText(_structuredDocument,3399));
-        assertEquals("beanWithMapProperties['mapProperty.foo.x']", getELText(_structuredDocument,3473));
-        assertEquals("beanWithMapProperties['treeMap.foo.x']", getELText(_structuredDocument,3549));
-        assertEquals("myBean.stringArrayProperty[myBean.stringProperty]", getELText(_structuredDocument,3621));
-        assertEquals("myBean.stringArrayProperty[-1]", getELText(_structuredDocument,3703));
-        assertEquals("beanWithListProperties.listProperty.someProperty", getELText(_structuredDocument,3766));
-        assertEquals("beanWithListProperties.arrayListProperty.someProperty", getELText(_structuredDocument,3845));
-        assertEquals("beanWithListProperties.arrayListProperty[-1]", getELText(_structuredDocument,3929));
-        assertEquals("listBean[-1]", getELText(_structuredDocument,4004));
-        assertEquals("bundle['y']", getELText(_structuredDocument,4050));
-        assertEquals("bundle[null]", getELText(_structuredDocument,4095));
-        assertEquals("listBean.stringProperty", getELText(_structuredDocument,4205));
+        assertEquals("bundle['x.y']", getELText(_structuredDocument,816));
+        assertEquals("beanWithMapProperties['integerProperty']", getELText(_structuredDocument,862));
+        assertEquals("bundle['x']", getELText(_structuredDocument,940));
+        assertEquals("beanWithMapProperties.treeMap", getELText(_structuredDocument,991));
+        assertEquals("beanWithMapProperties.treeMap.foo", getELText(_structuredDocument,1059));
+        assertEquals("beanWithMapProperties['treeMap'].foo", getELText(_structuredDocument,1125));
+        assertEquals("beanWithMapProperties['treeMap']['foo']", getELText(_structuredDocument,1195));
+        assertEquals("beanWithMapProperties.treeMap['foo']", getELText(_structuredDocument,1267));
+        assertEquals("mapBean['foo']", getELText(_structuredDocument,1343));
+        assertEquals("mapBean['foo.x']", getELText(_structuredDocument,1390));
+        assertEquals("mapBean['getIgnoredIntProperty']", getELText(_structuredDocument,1439));
+        assertEquals("beanWithMapProperties['actionProperty']", getELText(_structuredDocument,1508));
+        assertEquals("myBean.stringArrayProperty[0]", getELText(_structuredDocument,1578));
+        assertEquals("myBean.stringArrayProperty[myBean.integerProperty]", getELText(_structuredDocument,1637));
+        assertEquals("myBean.stringArrayProperty['0']", getELText(_structuredDocument,1717));
+        assertEquals("myBean.intArrayProperty[1]", getELText(_structuredDocument,1778));
+        assertEquals("myBean.intArrayProperty[1] > 0", getELText(_structuredDocument,1834));
+        assertEquals("empty myBean.arrayOfArrayOfStringProperty", getELText(_structuredDocument,1894));
+        assertEquals("empty myBean.arrayOfArrayOfStringProperty[1]", getELText(_structuredDocument,1965));
+        assertEquals("myBean.arrayOfArrayOfStringProperty[0][1]", getELText(_structuredDocument,2039));
+        assertEquals("myBean.arrayOfArrayOfStringProperty[myBean.intArrayProperty[0]][myBean.intArrayProperty[1]]", getELText(_structuredDocument,2110));
+        assertEquals("beanWithListProperties.listProperty[0]", getELText(_structuredDocument,2232));
+        assertEquals("beanWithListProperties.listProperty[myBean.integerProperty]", getELText(_structuredDocument,2300));
+        assertEquals("beanWithListProperties.listProperty['0']", getELText(_structuredDocument,2389));
+        assertEquals("beanWithListProperties.listProperty['0'].someValue", getELText(_structuredDocument,2459));
+        assertEquals("beanWithListProperties.arrayListProperty[0]", getELText(_structuredDocument,2539));
+        assertEquals("beanWithListProperties.arrayListProperty[myBean.integerProperty]", getELText(_structuredDocument,2612));
+        assertEquals("beanWithListProperties.arrayListProperty['0']", getELText(_structuredDocument,2706));
+        assertEquals("beanWithListProperties.arrayListProperty['0'].someValue", getELText(_structuredDocument,2781));
+        assertEquals("listBean[0]", getELText(_structuredDocument,2869));
+        assertEquals("listBean[myBean.integerProperty]", getELText(_structuredDocument,2910));
+        assertEquals("listBean['0']", getELText(_structuredDocument,2972));
+        assertEquals("listBean['0'].someValue", getELText(_structuredDocument,3015));
 
-        assertEquals("listBean['stringProperty']", getELText(_structuredDocument,4260));
-        assertEquals("myBean.stringArrayProperty['a']", getELText(_structuredDocument,4344));
-        assertEquals("beanWithListProperties.arrayListProperty['a']", getELText(_structuredDocument,4406));
-        assertEquals("beanWithListProperties.arrayListProperty[true]", getELText(_structuredDocument,4482));
-        assertEquals("listBean['a']", getELText(_structuredDocument,4559));
-        assertEquals("listBean[true]", getELText(_structuredDocument,4603));    
+        assertEquals("bundle['y']", getELText(_structuredDocument,3093));
+        assertEquals("bundle['x.z']", getELText(_structuredDocument,3137));
+        assertEquals("beanWithMapProperties['actionProperty.foo']", getELText(_structuredDocument,3183));
+        assertEquals("beanWithMapProperties['treeMap.foo']", getELText(_structuredDocument,3259));
+        assertEquals("beanWithMapProperties['mapProperty.foo']", getELText(_structuredDocument,3328));
+        assertEquals("beanWithMapProperties['mapProperty.foo.x']", getELText(_structuredDocument,3401));
+        assertEquals("beanWithMapProperties['treeMap.foo.x']", getELText(_structuredDocument,3476));
+        assertEquals("myBean.stringArrayProperty[myBean.stringProperty]", getELText(_structuredDocument,3547));
+        assertEquals("myBean.stringArrayProperty[-1]", getELText(_structuredDocument,3628));
+        assertEquals("beanWithListProperties.listProperty.someProperty", getELText(_structuredDocument,3689));
+        assertEquals("beanWithListProperties.arrayListProperty.someProperty", getELText(_structuredDocument,3767));
+        assertEquals("beanWithListProperties.arrayListProperty[-1]", getELText(_structuredDocument,3850));
+        assertEquals("listBean[-1]", getELText(_structuredDocument,3924));
+        assertEquals("bundle['y']", getELText(_structuredDocument,3969));
+        assertEquals("bundle[null]", getELText(_structuredDocument,4013));
+        assertEquals("listBean.stringProperty", getELText(_structuredDocument,4121));
+
+        assertEquals("listBean['stringProperty']", getELText(_structuredDocument,4175));
+        assertEquals("myBean.stringArrayProperty['a']", getELText(_structuredDocument,4256));
+        assertEquals("beanWithListProperties.arrayListProperty['a']", getELText(_structuredDocument,4317));
+        assertEquals("beanWithListProperties.arrayListProperty[true]", getELText(_structuredDocument,4392));
+        assertEquals("listBean['a']", getELText(_structuredDocument,4468));
+        assertEquals("listBean[true]", getELText(_structuredDocument,4511));
     }
-    
-    
-    public void testNoErrorExprs() 
+
+
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(841, TypeConstants.TYPE_STRING);
-        assertNoError(888, Signature.SIG_INT);
-//        assertNoError(967, TypeConstants.TYPE_STRING);
-        assertNoError(1020, "Ljava.util.TreeMap;");
-        assertNoError(1090, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1157, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1228, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1301, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1380, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1428, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1478, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1548, Signature.createMethodSignature(new String[0], TypeConstants.TYPE_STRING));
-        
-        assertNoError(1620, TypeConstants.TYPE_STRING);
-        assertNoError(1680, TypeConstants.TYPE_STRING);
-        assertNoError(1761, TypeConstants.TYPE_STRING);
-        
-        assertNoError(1823, Signature.SIG_INT);
-        assertNoError(1880, Signature.SIG_BOOLEAN);
-        assertNoError(1941, Signature.SIG_BOOLEAN);
-        assertNoError(2013, Signature.SIG_BOOLEAN);
+        assertNoError(816, TypeConstants.TYPE_STRING);
+        assertNoError(862, Signature.SIG_INT);
+        //        assertNoError(967, TypeConstants.TYPE_STRING);
+        assertNoError(991, "Ljava.util.TreeMap;");
+        assertNoError(1059, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1125, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1195, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1267, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1343, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1390, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1439, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1508, Signature.createMethodSignature(new String[0], TypeConstants.TYPE_STRING));
 
-        assertNoError(2088, TypeConstants.TYPE_STRING);
-        assertNoError(2160, TypeConstants.TYPE_STRING);
+        assertNoError(1578, TypeConstants.TYPE_STRING);
+        assertNoError(1637, TypeConstants.TYPE_STRING);
+        assertNoError(1717, TypeConstants.TYPE_STRING);
+
+        assertNoError(1778, Signature.SIG_INT);
+        assertNoError(1834, Signature.SIG_BOOLEAN);
+        assertNoError(1894, Signature.SIG_BOOLEAN);
+        assertNoError(1965, Signature.SIG_BOOLEAN);
+
+        assertNoError(2039, TypeConstants.TYPE_STRING);
+        assertNoError(2110, TypeConstants.TYPE_STRING);
 
 
-        assertNoError(2284, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(2353, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(2443, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(2514, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(2595, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(2669, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(2764, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(2840, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(2930, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2232, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2300, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2389, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2459, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2539, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2612, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2706, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2781, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2869, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(2910, TypeConstants.TYPE_JAVAOBJECT);
         assertNoError(2972, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(3035, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(3079, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(3015, TypeConstants.TYPE_JAVAOBJECT);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-
-        List<IMessage> list = assertSemanticWarning(3160, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
-        
-        list = assertSemanticWarning(3205, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
-        
-        list = assertSemanticWarning(3252, null, 1);
+        List<IMessage> list = assertSemanticWarning(3093, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3329, null, 1);
+        list = assertSemanticWarning(3137, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3399, null, 1);
+        list = assertSemanticWarning(3183, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3473, null, 1);
+        list = assertSemanticWarning(3259, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3549, null, 1);
+        list = assertSemanticWarning(3328, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3621, null, 1);
+        list = assertSemanticWarning(3401, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
+
+        list = assertSemanticWarning(3476, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
+
+        list = assertSemanticWarning(3547, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED_ID);
 
-        list = assertSemanticWarning(3703, null, 1);
+        list = assertSemanticWarning(3628, null, 1);
         assertContainsProblem(list, DiagnosticFactory.POSSIBLE_ARRAY_INDEX_OUT_OF_BOUNDS_ID);
 
-        list = assertSemanticWarning(3766, null, 1);
+        list = assertSemanticWarning(3689, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3845, null, 1);
+        list = assertSemanticWarning(3767, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3929, null, 1);
+        list = assertSemanticWarning(3850, null, 1);
         assertContainsProblem(list, DiagnosticFactory.POSSIBLE_ARRAY_INDEX_OUT_OF_BOUNDS_ID);
 
-        list = assertSemanticWarning(4004, null, 1);
+        list = assertSemanticWarning(3924, null, 1);
         assertContainsProblem(list, DiagnosticFactory.POSSIBLE_ARRAY_INDEX_OUT_OF_BOUNDS_ID);
 
-        list = assertSemanticWarning(4050, null, 1);
+        list = assertSemanticWarning(3969, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(4095, null, 1);
+        list = assertSemanticWarning(4013, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_DOT_WITH_VALUEB_NULL_ID);
 
         // the dot notation member is not found because base is a list
-        list = assertSemanticWarning(4205, null, 1);
+        list = assertSemanticWarning(4121, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
     }
-    
-    public void testErrorExprs() 
-    { 
-        List<IMessage> list = assertSemanticError(4260, null, 1);
+
+    @Override
+    public void testErrorExprs()
+    {
+        assertEquals("listBean['stringProperty']", getELText(_structuredDocument,4175));
+        assertEquals("myBean.stringArrayProperty['a']", getELText(_structuredDocument,4256));
+        assertEquals("beanWithListProperties.arrayListProperty['a']", getELText(_structuredDocument,4317));
+        assertEquals("beanWithListProperties.arrayListProperty[true]", getELText(_structuredDocument,4392));
+        assertEquals("listBean['a']", getELText(_structuredDocument,4468));
+        assertEquals("listBean[true]", getELText(_structuredDocument,4511));
+
+        List<IMessage> list = assertSemanticError(4175, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(4344, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(4406, null, 1);
+        list = assertSemanticError(4256, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(4482, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(4559, null, 1);
+        list = assertSemanticError(4317, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(4603, null, 1);
+        list = assertSemanticError(4392, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
+
+        list = assertSemanticError(4468, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
+
+        list = assertSemanticError(4511, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BuiltInSymbolsTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BuiltInSymbolsTestCase.java
index 947a0fc..172a917 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BuiltInSymbolsTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/BuiltInSymbolsTestCase.java
@@ -15,179 +15,185 @@
  * @author cbateman
  *
  */
-public class BuiltInSymbolsTestCase extends SingleJSPTestCase 
+public class BuiltInSymbolsTestCase extends SingleJSPTestCase
 {
-    public BuiltInSymbolsTestCase() 
+    public BuiltInSymbolsTestCase()
     {
         super("/testdata/jsps/builtinSymbols.jsp.data", "/builtinSymbols.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("applicationScope", getELText(_structuredDocument,1003));
-        assertEquals("sessionScope", getELText(_structuredDocument,1053));
-        assertEquals("requestScope", getELText(_structuredDocument,1099));
-        assertEquals("cookie", getELText(_structuredDocument,1145));
-        assertEquals("facesContext", getELText(_structuredDocument,1185));
-        assertEquals("header", getELText(_structuredDocument,1231));
-        assertEquals("headerValues", getELText(_structuredDocument,1271));
-        assertEquals("initParam", getELText(_structuredDocument,1317));
-        assertEquals("param", getELText(_structuredDocument,1360));
-        assertEquals("paramValues", getELText(_structuredDocument,1399));
-        assertEquals("view", getELText(_structuredDocument,1444));
-        assertEquals("applicationScope.mapBean", getELText(_structuredDocument,1533));
-        assertEquals("sessionScope.myBean", getELText(_structuredDocument,1640));
-        assertEquals("sessionScope.mapBean1", getELText(_structuredDocument,1690));
-        assertEquals("sessionScope.myBeanSettable", getELText(_structuredDocument,1742));
-        assertEquals("requestScope.myBeanSubClass", getELText(_structuredDocument,1852));
-        assertEquals("requestScope.hiddenBean", getELText(_structuredDocument,1910));
-        assertEquals("requestScope.bundle", getELText(_structuredDocument,1964));
-        assertEquals("requestScope.bundle2", getELText(_structuredDocument,2014));
-        assertEquals("empty cookie", getELText(_structuredDocument,2151));
-        assertEquals("empty header", getELText(_structuredDocument,2194));
-        assertEquals("empty headerValues", getELText(_structuredDocument,2237));
-        assertEquals("empty param", getELText(_structuredDocument,2286));
-        assertEquals("empty paramValues", getELText(_structuredDocument,2328));
-        assertEquals("facesContext.application", getELText(_structuredDocument,2429));
-        assertEquals("facesContext.clientIdsWithMessages", getELText(_structuredDocument,2484));
-        assertEquals("facesContext.externalContext", getELText(_structuredDocument,2549));
-        assertEquals("facesContext.maximumSeverity", getELText(_structuredDocument,2608));
-        assertEquals("facesContext.messages", getELText(_structuredDocument,2667));
-        assertEquals("facesContext.renderKit", getELText(_structuredDocument,2719));
-        assertEquals("facesContext.renderResponse", getELText(_structuredDocument,2772));
-        assertEquals("facesContext.responseComplete", getELText(_structuredDocument,2830));
-        assertEquals("facesContext.responseStream", getELText(_structuredDocument,2890));
-        assertEquals("facesContext.responseWriter", getELText(_structuredDocument,2948));
-        assertEquals("facesContext.viewRoot", getELText(_structuredDocument,3006));
-        assertEquals("view.viewId", getELText(_structuredDocument,3105));
-        assertEquals("view.family", getELText(_structuredDocument,3147));
-        assertEquals("view.locale", getELText(_structuredDocument,3189));
-        assertEquals("view.renderKitId", getELText(_structuredDocument,3231));
-        assertEquals("view.viewId", getELText(_structuredDocument,3278));
-        assertEquals("sessionScope.myBean.integerProperty", getELText(_structuredDocument,3377));
-        assertEquals("requestScope.bundle.bundleProp2", getELText(_structuredDocument,3446));
-        assertEquals("3 + sessionScope.myBean.integerProperty", getELText(_structuredDocument,3564));
+        assertEquals("applicationScope", getELText(_structuredDocument,975));
+        assertEquals("sessionScope", getELText(_structuredDocument,1024));
+        assertEquals("requestScope", getELText(_structuredDocument,1069));
+        assertEquals("cookie", getELText(_structuredDocument,1114));
+        assertEquals("facesContext", getELText(_structuredDocument,1153));
+        assertEquals("header", getELText(_structuredDocument,1198));
+        assertEquals("headerValues", getELText(_structuredDocument,1237));
+        assertEquals("initParam", getELText(_structuredDocument,1282));
+        assertEquals("param", getELText(_structuredDocument,1324));
+        assertEquals("paramValues", getELText(_structuredDocument,1362));
+        assertEquals("view", getELText(_structuredDocument,1406));
+        assertEquals("applicationScope.mapBean", getELText(_structuredDocument,1492));
+        assertEquals("sessionScope.myBean", getELText(_structuredDocument,1596));
+        assertEquals("sessionScope.mapBean1", getELText(_structuredDocument,1645));
+        assertEquals("sessionScope.myBeanSettable", getELText(_structuredDocument,1696));
+        assertEquals("requestScope.myBeanSubClass", getELText(_structuredDocument,1803));
+        assertEquals("requestScope.hiddenBean", getELText(_structuredDocument,1860));
+        assertEquals("requestScope.bundle", getELText(_structuredDocument,1913));
+        assertEquals("requestScope.bundle2", getELText(_structuredDocument,1962));
+        assertEquals("empty cookie", getELText(_structuredDocument,2096));
+        assertEquals("empty header", getELText(_structuredDocument,2138));
+        assertEquals("empty headerValues", getELText(_structuredDocument,2180));
+        assertEquals("empty param", getELText(_structuredDocument,2228));
+        assertEquals("empty paramValues", getELText(_structuredDocument,2269));
+        assertEquals("facesContext.application", getELText(_structuredDocument,2367));
+        assertEquals("facesContext.clientIdsWithMessages", getELText(_structuredDocument,2421));
+        assertEquals("facesContext.externalContext", getELText(_structuredDocument,2485));
+        assertEquals("facesContext.maximumSeverity", getELText(_structuredDocument,2543));
+        assertEquals("facesContext.messages", getELText(_structuredDocument,2601));
+        assertEquals("facesContext.renderKit", getELText(_structuredDocument,2652));
+        assertEquals("facesContext.renderResponse", getELText(_structuredDocument,2704));
+        assertEquals("facesContext.responseComplete", getELText(_structuredDocument,2761));
+        assertEquals("facesContext.responseStream", getELText(_structuredDocument,2820));
+        assertEquals("facesContext.responseWriter", getELText(_structuredDocument,2877));
+        assertEquals("facesContext.viewRoot", getELText(_structuredDocument,2934));
+        assertEquals("view.viewId", getELText(_structuredDocument,3030));
+        assertEquals("view.family", getELText(_structuredDocument,3071));
+        assertEquals("view.locale", getELText(_structuredDocument,3112));
+        assertEquals("view.renderKitId", getELText(_structuredDocument,3153));
+        assertEquals("view.viewId", getELText(_structuredDocument,3199));
+        assertEquals("sessionScope.myBean.integerProperty", getELText(_structuredDocument,3295));
+        assertEquals("requestScope.bundle.bundleProp2", getELText(_structuredDocument,3363));
+        assertEquals("3 + sessionScope.myBean.integerProperty", getELText(_structuredDocument,3478));
 
-        assertEquals("applicationScope.notAMember", getELText(_structuredDocument,3661));
-        assertEquals("sessionScope.notAMember", getELText(_structuredDocument,3722));
-        assertEquals("requestScope.notAMember", getELText(_structuredDocument,3779));
-        assertEquals("cookie.notAMember", getELText(_structuredDocument,3836));
-        assertEquals("facesContext.notAMember", getELText(_structuredDocument,3887));
-        assertEquals("header.notAMember", getELText(_structuredDocument,3944));
-        assertEquals("headerValues.notAMember", getELText(_structuredDocument,3995));
-        assertEquals("initParam.notAMember", getELText(_structuredDocument,4052));
-        assertEquals("param.notAMember", getELText(_structuredDocument,4106));
-        assertEquals("paramValues.notAMember", getELText(_structuredDocument,4156));
-        assertEquals("view.notAMember", getELText(_structuredDocument,4212));
-        assertEquals("applicationScope.myBean_none", getELText(_structuredDocument,4311));
-        assertEquals("sessionScope.myBean_none", getELText(_structuredDocument,4373));
-        assertEquals("requestScope.myBean_none", getELText(_structuredDocument,4431));
+        assertEquals("applicationScope.notAMember", getELText(_structuredDocument,3572));
+        assertEquals("sessionScope.notAMember", getELText(_structuredDocument,3632));
+        assertEquals("requestScope.notAMember", getELText(_structuredDocument,3688));
+        assertEquals("cookie.notAMember", getELText(_structuredDocument,3744));
+        assertEquals("facesContext.notAMember", getELText(_structuredDocument,3794));
+        assertEquals("header.notAMember", getELText(_structuredDocument,3850));
+        assertEquals("headerValues.notAMember", getELText(_structuredDocument,3900));
+        assertEquals("initParam.notAMember", getELText(_structuredDocument,3956));
+        assertEquals("param.notAMember", getELText(_structuredDocument,4009));
+        assertEquals("paramValues.notAMember", getELText(_structuredDocument,4058));
+        assertEquals("view.notAMember", getELText(_structuredDocument,4113));
+        assertEquals("applicationScope.myBean_none", getELText(_structuredDocument,4209));
+        assertEquals("sessionScope.myBean_none", getELText(_structuredDocument,4270));
+        assertEquals("requestScope.myBean_none", getELText(_structuredDocument,4327));
 
-        assertEquals("!initParam", getELText(_structuredDocument,4507));    
+        assertEquals("!initParam", getELText(_structuredDocument,4400));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(1003, TypeConstants.TYPE_MAP);
-        assertNoError(1053, TypeConstants.TYPE_MAP);
-        assertNoError(1099, TypeConstants.TYPE_MAP);
-        assertNoError(1145, TypeConstants.TYPE_MAP);
-        assertNoError(1185, "Ljavax.faces.context.FacesContext;");
-        assertNoError(1232, TypeConstants.TYPE_MAP);
-        assertNoError(1272, TypeConstants.TYPE_MAP);
-        assertNoError(1317, TypeConstants.TYPE_MAP);
-        assertNoError(1360, TypeConstants.TYPE_MAP);
-        assertNoError(1399, TypeConstants.TYPE_MAP);
-        assertNoError(1444, "Ljavax.faces.component.UIViewRoot;");
-        assertNoError(1533, "Lbeans.MapBean;");
-        assertNoError(1640, "Lbeans.MyBean;");
-        assertNoError(1690, "Lbeans.MapBean;");
-        assertNoError(1742, "Lbeans.MyBeanSettable;");
-        assertNoError(1852, "Lbeans.MyBeanSubClass;");
-        assertNoError(1910, "Lbeans.MyBean;");
+        assertNoError(975, TypeConstants.TYPE_MAP);
+        assertNoError(1024, TypeConstants.TYPE_MAP);
+        assertNoError(1069, TypeConstants.TYPE_MAP);
+        assertNoError(1114, TypeConstants.TYPE_MAP);
+        assertNoError(1153, "Ljavax.faces.context.FacesContext;");
+        assertNoError(1198, TypeConstants.TYPE_MAP);
+        assertNoError(1237, TypeConstants.TYPE_MAP);
+        assertNoError(1282, TypeConstants.TYPE_MAP);
+        assertNoError(1324, TypeConstants.TYPE_MAP);
+        assertNoError(1362, TypeConstants.TYPE_MAP);
+        assertNoError(1406, "Ljavax.faces.component.UIViewRoot;");
+        assertNoError(1492, "Lbeans.MapBean;");
+        assertNoError(1596, "Lbeans.MyBean;");
+        assertNoError(1645, "Lbeans.MapBean;");
+        assertNoError(1696, "Lbeans.MyBeanSettable;");
+        assertNoError(1803, "Lbeans.MyBeanSubClass;");
+        assertNoError(1860, "Lbeans.MyBean;");
 
-        assertNoError(1964, TypeConstants.TYPE_MAP);
-        assertNoError(2014, TypeConstants.TYPE_MAP);
-        
-        assertNoError(2151, Signature.SIG_BOOLEAN);
-        assertNoError(2194, Signature.SIG_BOOLEAN);
-        assertNoError(2237, Signature.SIG_BOOLEAN);
-        assertNoError(2286, Signature.SIG_BOOLEAN);
-        assertNoError(2328, Signature.SIG_BOOLEAN);
+        assertNoError(1913, TypeConstants.TYPE_MAP);
+        assertNoError(1962, TypeConstants.TYPE_MAP);
+
+        assertNoError(2096, Signature.SIG_BOOLEAN);
+        assertNoError(2138, Signature.SIG_BOOLEAN);
+        assertNoError(2180, Signature.SIG_BOOLEAN);
+        assertNoError(2228, Signature.SIG_BOOLEAN);
+        assertNoError(2269, Signature.SIG_BOOLEAN);
         // TODO: can't check these until we can import the required API jars
         // into the project
-//        assertEquals("facesContext.application", getELText(_structuredDocument,2854));
-//        assertEquals("facesContext.clientIdsWithMessages", getELText(_structuredDocument,2909));
-//        assertEquals("facesContext.externalContext", getELText(_structuredDocument,2974));
-//        assertEquals("facesContext.maximumSeverity", getELText(_structuredDocument,3033));
-//        assertEquals("facesContext.messages", getELText(_structuredDocument,3092));
-//        assertEquals("facesContext.renderKit", getELText(_structuredDocument,3144));
-//        assertEquals("facesContext.renderResponse", getELText(_structuredDocument,3197));
-//        assertEquals("facesContext.responseComplete", getELText(_structuredDocument,3255));
-//        assertEquals("facesContext.responseStream", getELText(_structuredDocument,3315));
-//        assertEquals("facesContext.responseWriter", getELText(_structuredDocument,3373));
-//        assertEquals("facesContext.viewRoot", getELText(_structuredDocument,3431));
-//        assertEquals("view.viewId", getELText(_structuredDocument,3530));
-//        assertEquals("view.family", getELText(_structuredDocument,3572));
-//        assertEquals("view.locale", getELText(_structuredDocument,3614));
-//        assertEquals("view.renderKitId", getELText(_structuredDocument,3656));
-//        assertEquals("view.viewId", getELText(_structuredDocument,3703));
-        assertNoError(3377, Signature.SIG_INT);
-        assertNoError(3446, TypeConstants.TYPE_STRING);
-        assertNoError(3564, Signature.SIG_LONG);
+        //        assertEquals("facesContext.application", getELText(_structuredDocument,2367));
+        //        assertEquals("facesContext.clientIdsWithMessages", getELText(_structuredDocument,2421));
+        //        assertEquals("facesContext.externalContext", getELText(_structuredDocument,2485));
+        //        assertEquals("facesContext.maximumSeverity", getELText(_structuredDocument,2543));
+        //        assertEquals("facesContext.messages", getELText(_structuredDocument,2601));
+        //        assertEquals("facesContext.renderKit", getELText(_structuredDocument,2652));
+        //        assertEquals("facesContext.renderResponse", getELText(_structuredDocument,2704));
+        //        assertEquals("facesContext.responseComplete", getELText(_structuredDocument,2761));
+        //        assertEquals("facesContext.responseStream", getELText(_structuredDocument,2820));
+        //        assertEquals("facesContext.responseWriter", getELText(_structuredDocument,2877));
+        //        assertEquals("facesContext.viewRoot", getELText(_structuredDocument,2934));
+        //        assertEquals("view.viewId", getELText(_structuredDocument,3030));
+        //        assertEquals("view.family", getELText(_structuredDocument,3071));
+        //        assertEquals("view.locale", getELText(_structuredDocument,3112));
+        //        assertEquals("view.renderKitId", getELText(_structuredDocument,3153));
+        //        assertEquals("view.viewId", getELText(_structuredDocument,3199));
+        assertNoError(3295, Signature.SIG_INT);
+        assertNoError(3363, TypeConstants.TYPE_STRING);
+        assertNoError(3478, Signature.SIG_LONG);
     }
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(3661,null,1);
+        List<IMessage> list = assertSemanticWarning(3572,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3722,null,1);
+        list = assertSemanticWarning(3632,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3779,null,1);
+        list = assertSemanticWarning(3688,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3836,null,1);
+        list = assertSemanticWarning(3744,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3887,null,1);
+        list = assertSemanticWarning(3794,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3944,null,1);
+        list = assertSemanticWarning(3850,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(3995,null,1);
+        list = assertSemanticWarning(3900,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(4052,null,1);
+        list = assertSemanticWarning(3956,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(4106,null,1);
+        list = assertSemanticWarning(4009,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(4156,null,1);
+        list = assertSemanticWarning(4058,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        list = assertSemanticWarning(4212,null,1);
+        list = assertSemanticWarning(4113,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
-        
-        list = assertSemanticWarning(4311,null,1);
+
+        list = assertSemanticWarning(4209,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
-        
-        list = assertSemanticWarning(4373,null,1);
+
+        list = assertSemanticWarning(4270,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
-        
-        list = assertSemanticWarning(4431,null,1);
+
+        list = assertSemanticWarning(4327,null,1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
     }
-    public void testErrorExprs() 
+
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(4507,null,1);
+        final List<IMessage> list = assertSemanticError(4400,null,1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/DataTableResolutionTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/DataTableResolutionTestCase.java
index c7f9046..563c2ea 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/DataTableResolutionTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/DataTableResolutionTestCase.java
@@ -8,44 +8,51 @@
 import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 
-public class DataTableResolutionTestCase extends SingleJSPTestCase 
+public class DataTableResolutionTestCase extends SingleJSPTestCase
 {
-    public DataTableResolutionTestCase() 
+    public DataTableResolutionTestCase()
     {
         super("/testdata/jsps/dataTableResolution.jsp.data", "/dataTableResolution.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("foo.x", getELText(_structuredDocument,906));
-        assertEquals("row1.name", getELText(_structuredDocument,1069));
-        assertEquals("row3.stringProperty", getELText(_structuredDocument,1227));
-        assertEquals("row4.anyField", getELText(_structuredDocument,1408));
-        assertEquals("row2WrongVar.x", getELText(_structuredDocument,1606));
-        assertEquals("row2.wrongMember", getELText(_structuredDocument,1745));    }
+        assertEquals("foo.x", getELText(_structuredDocument,879));
+        assertEquals("row1.name", getELText(_structuredDocument,1036));
+        assertEquals("row3.stringProperty", getELText(_structuredDocument,1188));
+        assertEquals("row4.anyField", getELText(_structuredDocument,1363));
 
+        assertEquals("row2WrongVar.x", getELText(_structuredDocument,1554));
+        assertEquals("row2.wrongMember", getELText(_structuredDocument,1687));
+    }
+
+    @Override
     public void testNoErrorExprs()
     {
-        assertNoError(906, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1069, TypeConstants.TYPE_STRING);
-        assertNoError(1227, TypeConstants.TYPE_STRING);
-        assertNoError(1408, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(879, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1036, TypeConstants.TYPE_STRING);
+        assertNoError(1188, TypeConstants.TYPE_STRING);
+        assertNoError(1363, TypeConstants.TYPE_JAVAOBJECT);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> problems = assertSemanticWarning(1606, null, 1);
+        List<IMessage> problems = assertSemanticWarning(1554, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.VARIABLE_NOT_FOUND_ID);
-        
-        problems = assertSemanticWarning(1745, null, 1);
+
+        problems = assertSemanticWarning(1687, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
     }
-    
+
+    @Override
     public void testErrorExprs() {
         // no errors
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GenericsTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GenericsTestCase.java
index a5c027b..5ef3b1a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GenericsTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GenericsTestCase.java
@@ -3,33 +3,51 @@
 import org.eclipse.jst.jsf.core.JSFVersion;
 import org.eclipse.jst.jsf.validation.el.tests.base.SingleJSPTestCase;
 
-public class GenericsTestCase extends SingleJSPTestCase 
+public class GenericsTestCase extends SingleJSPTestCase
 {
     public GenericsTestCase()
     {
         super("/testdata/jsps/propertiesOfMaps.jsp.data", "/propertiesOfMaps.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
     @Override
+    public void testSanity()
+    {
+        assertEquals("beanWithMapProperties.integerProperty", getELText(_structuredDocument,880));
+        assertEquals("bundle.bundleProp1", getELText(_structuredDocument,955));
+        assertEquals("bundle.x.y", getELText(_structuredDocument,1006));
+        assertEquals("beanWithMapProperties.treeMap.foo", getELText(_structuredDocument,1049));
+        assertEquals("beanWithMapProperties.treeMap.foo.x", getELText(_structuredDocument,1115));
+        assertEquals("beanWithMapProperties.mapProperty.foo", getELText(_structuredDocument,1183));
+        assertEquals("beanWithMapProperties.mapProperty.foo.x", getELText(_structuredDocument,1253));
+        assertEquals("mapBean.foo", getELText(_structuredDocument,1325));
+        assertEquals("mapBean.foo.x", getELText(_structuredDocument,1369));
+        assertEquals("mapBean.getIgnoredIntProperty", getELText(_structuredDocument,1415));
+        assertEquals("bundle.y", getELText(_structuredDocument,1478));
+        assertEquals("bundle.bundleProp1.z", getELText(_structuredDocument,1519));
+    }
+
+    @Override
     public void testErrorExprs() {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void testNoErrorExprs() {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void testWarningExprs() {
         // TODO Auto-generated method stub
-        
+
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GreaterThanEqTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GreaterThanEqTestCase.java
index 92d6c7d..f7ff58e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GreaterThanEqTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GreaterThanEqTestCase.java
@@ -21,175 +21,179 @@
         super("/testdata/jsps/greaterThanEq.jsp.data", "/greaterThanEq.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("myBean.stringProperty >= '3'", getELText(_structuredDocument,852));
-        assertEquals("myBean.stringProperty ge '3'", getELText(_structuredDocument,914));
-        assertEquals("myBean.integerProperty >= 3", getELText(_structuredDocument,976));
-        assertEquals("myBean.integerProperty ge 3", getELText(_structuredDocument,1037));
-        assertEquals("myBean.integerProperty >= '4' ", getELText(_structuredDocument,1098));
-        assertEquals("myBean.integerProperty ge '4' ", getELText(_structuredDocument,1162));
-        assertEquals("myBean.comparableProperty >= myBean.collectionProperty", getELText(_structuredDocument,1227));
-        assertEquals("myBean.comparableProperty ge myBean.collectionProperty", getELText(_structuredDocument,1315));
-        assertEquals("myBean.integerProperty >= -3", getELText(_structuredDocument,1405));
-        assertEquals("myBean.doubleProperty >= 5", getELText(_structuredDocument,1467));
-        assertEquals("5 ge myBean.bigIntegerProperty", getELText(_structuredDocument,1527));
-        assertEquals("myBean.bigDoubleProperty >= myBean.bigIntegerProperty", getELText(_structuredDocument,1591));
-        assertEquals("myBean.coins >= 'quarter'", getELText(_structuredDocument,1678));
-        assertEquals("myBean.coins ge 'quarter'", getELText(_structuredDocument,1737));
-        assertEquals("myBean.rawEnum >= 'quarter'", getELText(_structuredDocument,1796));
-        assertEquals("myBean.coinEnum ge 'quarter'", getELText(_structuredDocument,1857));
-        assertEquals("myBean.rawEnum >= myBean.coins", getELText(_structuredDocument,1915));
-        assertEquals("myBean.coinEnum >= myBean.colors", getELText(_structuredDocument,1975));
+        assertEquals("myBean.stringProperty >= '3'", getELText(_structuredDocument,828));
+        assertEquals("myBean.stringProperty ge '3'", getELText(_structuredDocument,889));
+        assertEquals("myBean.integerProperty >= 3", getELText(_structuredDocument,950));
+        assertEquals("myBean.integerProperty ge 3", getELText(_structuredDocument,1010));
+        assertEquals("myBean.integerProperty >= '4' ", getELText(_structuredDocument,1070));
+        assertEquals("myBean.integerProperty ge '4' ", getELText(_structuredDocument,1133));
+        assertEquals("myBean.comparableProperty >= myBean.collectionProperty", getELText(_structuredDocument,1197));
+        assertEquals("myBean.comparableProperty ge myBean.collectionProperty", getELText(_structuredDocument,1284));
+        assertEquals("myBean.integerProperty >= -3", getELText(_structuredDocument,1373));
+        assertEquals("myBean.doubleProperty >= 5", getELText(_structuredDocument,1434));
+        assertEquals("5 ge myBean.bigIntegerProperty", getELText(_structuredDocument,1493));
+        assertEquals("myBean.bigDoubleProperty >= myBean.bigIntegerProperty", getELText(_structuredDocument,1556));
+        assertEquals("myBean.coins >= 'quarter'", getELText(_structuredDocument,1642));
+        assertEquals("myBean.coins ge 'quarter'", getELText(_structuredDocument,1700));
+        assertEquals("myBean.rawEnum >= 'quarter'", getELText(_structuredDocument,1758));
+        assertEquals("myBean.coinEnum ge 'quarter'", getELText(_structuredDocument,1818));
+        assertEquals("myBean.rawEnum >= myBean.coins", getELText(_structuredDocument,1875));
+        assertEquals("myBean.coinEnum >= myBean.colors", getELText(_structuredDocument,1934));
 
-        assertEquals("5 >= 3", getELText(_structuredDocument,2070));
-        assertEquals("5 ge 3", getELText(_structuredDocument,2107));
-        assertEquals("'4' >= '34'", getELText(_structuredDocument,2144));
-        assertEquals("'4' ge '34'", getELText(_structuredDocument,2186));
-        assertEquals("'34' >= '34'", getELText(_structuredDocument,2228));
-        assertEquals("'34' ge '34'", getELText(_structuredDocument,2271));
-        assertEquals("-5 >= 2", getELText(_structuredDocument,2314));
-        assertEquals("-5 ge 2", getELText(_structuredDocument,2352));
-        assertEquals("2 >= -5", getELText(_structuredDocument,2390));
-        assertEquals("2 ge -5", getELText(_structuredDocument,2428));
-        assertEquals("-5 >= -5", getELText(_structuredDocument,2466));
-        assertEquals("-5 ge -5", getELText(_structuredDocument,2505));
-        assertEquals("myBean.integerProperty >= null", getELText(_structuredDocument,2544));
-        assertEquals("null ge myBean.integerProperty", getELText(_structuredDocument,2605));
+        assertEquals("5 >= 3", getELText(_structuredDocument,2026));
+        assertEquals("5 ge 3", getELText(_structuredDocument,2062));
+        assertEquals("'4' >= '34'", getELText(_structuredDocument,2098));
+        assertEquals("'4' ge '34'", getELText(_structuredDocument,2139));
+        assertEquals("'34' >= '34'", getELText(_structuredDocument,2180));
+        assertEquals("'34' ge '34'", getELText(_structuredDocument,2222));
+        assertEquals("-5 >= 2", getELText(_structuredDocument,2264));
+        assertEquals("-5 ge 2", getELText(_structuredDocument,2301));
+        assertEquals("2 >= -5", getELText(_structuredDocument,2338));
+        assertEquals("2 ge -5", getELText(_structuredDocument,2375));
+        assertEquals("-5 >= -5", getELText(_structuredDocument,2412));
+        assertEquals("-5 ge -5", getELText(_structuredDocument,2450));
+        assertEquals("myBean.integerProperty >= null", getELText(_structuredDocument,2488));
+        assertEquals("null ge myBean.integerProperty", getELText(_structuredDocument,2548));
 
-        assertEquals("5 >= true", getELText(_structuredDocument,2689));
-        assertEquals("5 ge true", getELText(_structuredDocument,2729));
-        assertEquals("myBean.integerProperty >= myBean.booleanProperty", getELText(_structuredDocument,2769));
-        assertEquals("myBean.integerProperty ge myBean.booleanProperty", getELText(_structuredDocument,2848));
-        assertEquals("myBean.stringArrayProperty >= myBean.booleanProperty", getELText(_structuredDocument,2927));
-        assertEquals("myBean.stringArrayProperty ge myBean.booleanProperty", getELText(_structuredDocument,3010));
-        assertEquals("myBean.integerProperty >= true ", getELText(_structuredDocument,3096));
-        assertEquals("myBean.integerProperty ge true ", getELText(_structuredDocument,3161));
-        assertEquals("myBean.booleanProperty >= true", getELText(_structuredDocument,3226));
-        assertEquals("myBean.booleanProperty ge true", getELText(_structuredDocument,3290));
-        assertEquals("true >= false", getELText(_structuredDocument,3352));
-        assertEquals("true ge false", getELText(_structuredDocument,3397));
-        assertEquals("myBean.coins >= myBean.colors", getELText(_structuredDocument,3441));
-        assertEquals("myBean.coins ge myBean.colors", getELText(_structuredDocument,3501));
-    }
-    
-    public void testNoErrorExprs() 
-    {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(914, Signature.SIG_BOOLEAN);
-        assertNoError(976, Signature.SIG_BOOLEAN);
-        assertNoError(1037, Signature.SIG_BOOLEAN);
-        assertNoError(1098, Signature.SIG_BOOLEAN);
-        assertNoError(1162, Signature.SIG_BOOLEAN);
-        assertNoError(1227, Signature.SIG_BOOLEAN);
-        assertNoError(1315, Signature.SIG_BOOLEAN);
-        assertNoError(1405, Signature.SIG_BOOLEAN);
-        assertNoError(1467, Signature.SIG_BOOLEAN);
-        assertNoError(1527, Signature.SIG_BOOLEAN);
-        assertNoError(1591, Signature.SIG_BOOLEAN);
-        assertNoError(1678, Signature.SIG_BOOLEAN);
-        assertNoError(1737, Signature.SIG_BOOLEAN);
-        assertNoError(1796, Signature.SIG_BOOLEAN);
-        assertNoError(1857, Signature.SIG_BOOLEAN);
-        assertNoError(1915, Signature.SIG_BOOLEAN);
-        assertNoError(1975, Signature.SIG_BOOLEAN);
+        assertEquals("5 >= true", getELText(_structuredDocument,2629));
+        assertEquals("5 ge true", getELText(_structuredDocument,2668));
+        assertEquals("myBean.integerProperty >= myBean.booleanProperty", getELText(_structuredDocument,2707));
+        assertEquals("myBean.integerProperty ge myBean.booleanProperty", getELText(_structuredDocument,2785));
+        assertEquals("myBean.stringArrayProperty >= myBean.booleanProperty", getELText(_structuredDocument,2863));
+        assertEquals("myBean.stringArrayProperty ge myBean.booleanProperty", getELText(_structuredDocument,2945));
+        assertEquals("myBean.integerProperty >= true ", getELText(_structuredDocument,3030));
+        assertEquals("myBean.integerProperty ge true ", getELText(_structuredDocument,3094));
+        assertEquals("myBean.booleanProperty >= true", getELText(_structuredDocument,3158));
+        assertEquals("myBean.booleanProperty ge true", getELText(_structuredDocument,3221));
+        assertEquals("true >= false", getELText(_structuredDocument,3282));
+        assertEquals("true ge false", getELText(_structuredDocument,3326));
+        assertEquals("myBean.coins >= myBean.colors", getELText(_structuredDocument,3369));
+        assertEquals("myBean.coins ge myBean.colors", getELText(_structuredDocument,3428));
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        List<IMessage> list = assertSemanticWarning(2070, Signature.SIG_BOOLEAN, 1);
+        assertNoError(828, Signature.SIG_BOOLEAN);
+        assertNoError(889, Signature.SIG_BOOLEAN);
+        assertNoError(950, Signature.SIG_BOOLEAN);
+        assertNoError(1010, Signature.SIG_BOOLEAN);
+        assertNoError(1070, Signature.SIG_BOOLEAN);
+        assertNoError(1133, Signature.SIG_BOOLEAN);
+        assertNoError(1197, Signature.SIG_BOOLEAN);
+        assertNoError(1284, Signature.SIG_BOOLEAN);
+        assertNoError(1373, Signature.SIG_BOOLEAN);
+        assertNoError(1434, Signature.SIG_BOOLEAN);
+        assertNoError(1493, Signature.SIG_BOOLEAN);
+        assertNoError(1556, Signature.SIG_BOOLEAN);
+        assertNoError(1642, Signature.SIG_BOOLEAN);
+        assertNoError(1700, Signature.SIG_BOOLEAN);
+        assertNoError(1758, Signature.SIG_BOOLEAN);
+        assertNoError(1818, Signature.SIG_BOOLEAN);
+        assertNoError(1875, Signature.SIG_BOOLEAN);
+        assertNoError(1934, Signature.SIG_BOOLEAN);
+    }
+
+    @Override
+    public void testWarningExprs()
+    {
+        List<IMessage> list = assertSemanticWarning(2026, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2107, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2062, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2144, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2098, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2186, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2139, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2228, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2180, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2271, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2222, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2314, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2264, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2352, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2301, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2390, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2338, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2428, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2375, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2466, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2412, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2505, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2450, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2544, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2488, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2605, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2548, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(2689, null, 1);
+        List<IMessage> list = assertSemanticError(2629, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2729, null, 1);
+        list = assertSemanticError(2668, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2769, null, 1);
+        list = assertSemanticError(2707, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2848, null, 1);
+        list = assertSemanticError(2785, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2927, null, 1);
+        list = assertSemanticError(2863, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3010, null, 1);
+        list = assertSemanticError(2945, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3096, null, 1);
+        list = assertSemanticError(3030, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3161, null, 1);
+        list = assertSemanticError(3094, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3226, null, 1);
+        list = assertSemanticError(3158, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3290, null, 1);
+        list = assertSemanticError(3221, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3352, null, 1);
+        list = assertSemanticError(3282, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3397, null, 1);
+        list = assertSemanticError(3326, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3441, null, 1);
+        list = assertSemanticError(3369, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE_ID);
 
-        list = assertSemanticError(3501, null, 1);
+        list = assertSemanticError(3428, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GreaterThanTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GreaterThanTestCase.java
index e983500..e9512f0 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GreaterThanTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/GreaterThanTestCase.java
@@ -13,183 +13,190 @@
  * 
  * @author cbateman
  */
-public class GreaterThanTestCase extends SingleJSPTestCase 
+public class GreaterThanTestCase extends SingleJSPTestCase
 {
-    public GreaterThanTestCase() 
+    public GreaterThanTestCase()
     {
         super("/testdata/jsps/greaterThan.jsp.data", "/greaterThan.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        assertEquals("myBean.stringProperty > '3'", getELText(_structuredDocument,852));
-        assertEquals("myBean.stringProperty gt '3'", getELText(_structuredDocument,913));
-        assertEquals("myBean.integerProperty > 3", getELText(_structuredDocument,975));
-        assertEquals("myBean.integerProperty gt 3", getELText(_structuredDocument,1035));
-        assertEquals("myBean.integerProperty > '4' ", getELText(_structuredDocument,1096));
-        assertEquals("myBean.integerProperty gt '4' ", getELText(_structuredDocument,1159));
-        assertEquals("myBean.comparableProperty > myBean.collectionProperty", getELText(_structuredDocument,1224));
-        assertEquals("myBean.comparableProperty gt myBean.collectionProperty", getELText(_structuredDocument,1311));
-        assertEquals("myBean.integerProperty > -3", getELText(_structuredDocument,1399));
-        assertEquals("myBean.doubleProperty > 5", getELText(_structuredDocument,1460));
-        assertEquals("5 gt myBean.bigIntegerProperty", getELText(_structuredDocument,1519));
-        assertEquals("myBean.bigDoubleProperty > myBean.bigIntegerProperty", getELText(_structuredDocument,1583));
-        assertEquals("myBean.coins > 'quarter'", getELText(_structuredDocument,1669));
-        assertEquals("myBean.coins gt 'quarter'", getELText(_structuredDocument,1727));
-        assertEquals("myBean.rawEnum > 'quarter'", getELText(_structuredDocument,1786));
-        assertEquals("myBean.coinEnum gt 'quarter'", getELText(_structuredDocument,1846));
-        assertEquals("myBean.rawEnum > myBean.coins", getELText(_structuredDocument,1904));
-        assertEquals("myBean.coinEnum > myBean.colors", getELText(_structuredDocument,1963));
 
-        assertEquals("5 > 3", getELText(_structuredDocument,2054));
-        assertEquals("5 gt 3", getELText(_structuredDocument,2090));
-        assertEquals("'4' > '34'", getELText(_structuredDocument,2127));
-        assertEquals("'4' gt '34'", getELText(_structuredDocument,2168));
-        assertEquals("'34' > '34'", getELText(_structuredDocument,2210));
-        assertEquals("'34' gt '34'", getELText(_structuredDocument,2252));
-        assertEquals("-5 > 2", getELText(_structuredDocument,2295));
-        assertEquals("-5 gt 2", getELText(_structuredDocument,2332));
-        assertEquals("2 > -5", getELText(_structuredDocument,2370));
-        assertEquals("2 gt -5", getELText(_structuredDocument,2407));
-        assertEquals("-5 > -5", getELText(_structuredDocument,2445));
-        assertEquals("-5 gt -5", getELText(_structuredDocument,2483));
-        assertEquals("myBean.integerProperty > null", getELText(_structuredDocument,2522));
-        assertEquals("null gt myBean.integerProperty", getELText(_structuredDocument,2582));
+        assertEquals("myBean.stringProperty > '3'", getELText(_structuredDocument,828));
+        assertEquals("myBean.stringProperty gt '3'", getELText(_structuredDocument,888));
+        assertEquals("myBean.integerProperty > 3", getELText(_structuredDocument,949));
+        assertEquals("myBean.integerProperty gt 3", getELText(_structuredDocument,1008));
+        assertEquals("myBean.integerProperty > '4' ", getELText(_structuredDocument,1068));
+        assertEquals("myBean.integerProperty gt '4' ", getELText(_structuredDocument,1130));
+        assertEquals("myBean.comparableProperty > myBean.collectionProperty", getELText(_structuredDocument,1194));
+        assertEquals("myBean.comparableProperty gt myBean.collectionProperty", getELText(_structuredDocument,1280));
+        assertEquals("myBean.integerProperty > -3", getELText(_structuredDocument,1367));
+        assertEquals("myBean.doubleProperty > 5", getELText(_structuredDocument,1427));
+        assertEquals("5 gt myBean.bigIntegerProperty", getELText(_structuredDocument,1485));
+        assertEquals("myBean.bigDoubleProperty > myBean.bigIntegerProperty", getELText(_structuredDocument,1548));
+        assertEquals("myBean.coins > 'quarter'", getELText(_structuredDocument,1633));
+        assertEquals("myBean.coins gt 'quarter'", getELText(_structuredDocument,1690));
+        assertEquals("myBean.rawEnum > 'quarter'", getELText(_structuredDocument,1748));
+        assertEquals("myBean.coinEnum gt 'quarter'", getELText(_structuredDocument,1807));
+        assertEquals("myBean.rawEnum > myBean.coins", getELText(_structuredDocument,1864));
+        assertEquals("myBean.coinEnum > myBean.colors", getELText(_structuredDocument,1922));
 
-        assertEquals("5 > true", getELText(_structuredDocument,2666));
-        assertEquals("5 gt true", getELText(_structuredDocument,2705));
-        assertEquals("myBean.integerProperty > myBean.booleanProperty", getELText(_structuredDocument,2745));
-        assertEquals("myBean.integerProperty gt myBean.booleanProperty", getELText(_structuredDocument,2823));
-        assertEquals("myBean.stringArrayProperty > myBean.booleanProperty", getELText(_structuredDocument,2902));
-        assertEquals("myBean.stringArrayProperty gt myBean.booleanProperty", getELText(_structuredDocument,2984));
-        assertEquals("myBean.integerProperty > true ", getELText(_structuredDocument,3070));
-        assertEquals("myBean.integerProperty gt true ", getELText(_structuredDocument,3134));
-        assertEquals("myBean.booleanProperty > true", getELText(_structuredDocument,3199));
-        assertEquals("myBean.booleanProperty gt true", getELText(_structuredDocument,3262));
-        assertEquals("true > false", getELText(_structuredDocument,3324));
-        assertEquals("true > false", getELText(_structuredDocument,3413));
-        assertEquals("myBean.coins > myBean.colors", getELText(_structuredDocument,3456));
-        assertEquals("myBean.coins gt myBean.colors", getELText(_structuredDocument,3515));
-    }
-    
-    public void testNoErrorExprs() 
-    {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(913, Signature.SIG_BOOLEAN);
-        assertNoError(975, Signature.SIG_BOOLEAN);
-        assertNoError(1035, Signature.SIG_BOOLEAN);
-        assertNoError(1096, Signature.SIG_BOOLEAN);
-        assertNoError(1159, Signature.SIG_BOOLEAN);
-        assertNoError(1224, Signature.SIG_BOOLEAN);
-        assertNoError(1311, Signature.SIG_BOOLEAN);
-        assertNoError(1399, Signature.SIG_BOOLEAN);
-        assertNoError(1460, Signature.SIG_BOOLEAN);
-        assertNoError(1519, Signature.SIG_BOOLEAN);
-        assertNoError(1583, Signature.SIG_BOOLEAN);
-        assertNoError(1669, Signature.SIG_BOOLEAN);
-        assertNoError(1727, Signature.SIG_BOOLEAN);
-        assertNoError(1786, Signature.SIG_BOOLEAN);
-        assertNoError(1846, Signature.SIG_BOOLEAN);
-        assertNoError(1904, Signature.SIG_BOOLEAN);
-        assertNoError(1963, Signature.SIG_BOOLEAN);
+        assertEquals("5 > 3", getELText(_structuredDocument,2010));
+        assertEquals("5 gt 3", getELText(_structuredDocument,2045));
+        assertEquals("'4' > '34'", getELText(_structuredDocument,2081));
+        assertEquals("'4' gt '34'", getELText(_structuredDocument,2121));
+        assertEquals("'34' > '34'", getELText(_structuredDocument,2162));
+        assertEquals("'34' gt '34'", getELText(_structuredDocument,2203));
+        assertEquals("-5 > 2", getELText(_structuredDocument,2245));
+        assertEquals("-5 gt 2", getELText(_structuredDocument,2281));
+        assertEquals("2 > -5", getELText(_structuredDocument,2318));
+        assertEquals("2 gt -5", getELText(_structuredDocument,2354));
+        assertEquals("-5 > -5", getELText(_structuredDocument,2391));
+        assertEquals("-5 gt -5", getELText(_structuredDocument,2428));
+        assertEquals("myBean.integerProperty > null", getELText(_structuredDocument,2466));
+        assertEquals("null gt myBean.integerProperty", getELText(_structuredDocument,2525));
+
+        assertEquals("5 > true", getELText(_structuredDocument,2606));
+        assertEquals("5 gt true", getELText(_structuredDocument,2644));
+        assertEquals("myBean.integerProperty > myBean.booleanProperty", getELText(_structuredDocument,2683));
+        assertEquals("myBean.integerProperty gt myBean.booleanProperty", getELText(_structuredDocument,2760));
+        assertEquals("myBean.stringArrayProperty > myBean.booleanProperty", getELText(_structuredDocument,2838));
+        assertEquals("myBean.stringArrayProperty gt myBean.booleanProperty", getELText(_structuredDocument,2919));
+        assertEquals("myBean.integerProperty > true ", getELText(_structuredDocument,3004));
+        assertEquals("myBean.integerProperty gt true ", getELText(_structuredDocument,3067));
+        assertEquals("myBean.booleanProperty > true", getELText(_structuredDocument,3131));
+        assertEquals("myBean.booleanProperty gt true", getELText(_structuredDocument,3193));
+        assertEquals("true > false", getELText(_structuredDocument,3254));
+        assertEquals("true gt false", getELText(_structuredDocument,3297));
+        assertEquals("true > false", getELText(_structuredDocument,3341));
+        assertEquals("myBean.coins > myBean.colors", getELText(_structuredDocument,3383));
+        assertEquals("myBean.coins gt myBean.colors", getELText(_structuredDocument,3441));
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        List<IMessage> list = assertSemanticWarning(2054, Signature.SIG_BOOLEAN, 1);
+        assertNoError(828, Signature.SIG_BOOLEAN);
+        assertNoError(888, Signature.SIG_BOOLEAN);
+        assertNoError(949, Signature.SIG_BOOLEAN);
+        assertNoError(1008, Signature.SIG_BOOLEAN);
+        assertNoError(1068, Signature.SIG_BOOLEAN);
+        assertNoError(1130, Signature.SIG_BOOLEAN);
+        assertNoError(1194, Signature.SIG_BOOLEAN);
+        assertNoError(1280, Signature.SIG_BOOLEAN);
+        assertNoError(1367, Signature.SIG_BOOLEAN);
+        assertNoError(1427, Signature.SIG_BOOLEAN);
+        assertNoError(1485, Signature.SIG_BOOLEAN);
+        assertNoError(1548, Signature.SIG_BOOLEAN);
+        assertNoError(1633, Signature.SIG_BOOLEAN);
+        assertNoError(1690, Signature.SIG_BOOLEAN);
+        assertNoError(1748, Signature.SIG_BOOLEAN);
+        assertNoError(1807, Signature.SIG_BOOLEAN);
+        assertNoError(1864, Signature.SIG_BOOLEAN);
+        assertNoError(1922, Signature.SIG_BOOLEAN);
+    }
+
+    @Override
+    public void testWarningExprs()
+    {
+        List<IMessage> list = assertSemanticWarning(2010, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2090, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2045, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2127, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2081, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2168, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2121, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2210, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2162, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2252, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2203, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2295, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2245, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2332, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2281, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2370, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2318, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2407, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2354, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2445, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2391, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2483, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2428, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2522, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2466, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2582, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2525, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(2666, null, 1);
+        List<IMessage> list = assertSemanticError(2606, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2705, null, 1);
+        list = assertSemanticError(2644, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2745, null, 1);
+        list = assertSemanticError(2683, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2823, null, 1);
+        list = assertSemanticError(2760, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2902, null, 1);
+        list = assertSemanticError(2838, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(2984, null, 1);
+        list = assertSemanticError(2919, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3070, null, 1);
+        list = assertSemanticError(3004, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3134, null, 1);
+        list = assertSemanticError(3067, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3199, null, 1);
+        list = assertSemanticError(3131, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3262, null, 1);
+        list = assertSemanticError(3193, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3324, null, 1);
+        list = assertSemanticError(3254, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3368, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
-        
-        list = assertSemanticError(3413, null, 1);
+        list = assertSemanticError(3297, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3456, null, 1);
+        list = assertSemanticError(3341, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
+
+        list = assertSemanticError(3383, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE_ID);
 
-        list = assertSemanticError(3515, null, 1);
+        list = assertSemanticError(3441, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/JSPFunctionsTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/JSPFunctionsTestCase.java
index 868be06..a692c1a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/JSPFunctionsTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/JSPFunctionsTestCase.java
@@ -12,49 +12,55 @@
  * 
  * @author cbateman
  */
-public class JSPFunctionsTestCase extends SingleJSPTestCase 
+public class JSPFunctionsTestCase extends SingleJSPTestCase
 {
     public JSPFunctionsTestCase() {
         super("/testdata/jsps/jspFunctions.jsp.data", "/jspFunctions.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("f:someFunc(6) > 8", getELText(_structuredDocument,967));
-        assertEquals("f:someFunc(6)", getELText(_structuredDocument,1018));
-        assertEquals("f:someFunc(true)", getELText(_structuredDocument,1065));
-        assertEquals("someFunc(6) > 8", getELText(_structuredDocument,1260));
-        assertEquals("someFunc(6)", getELText(_structuredDocument,1309));
-        assertEquals("someFunc(true)", getELText(_structuredDocument,1354));
+        assertEquals("f:someFunc(6) > 8", getELText(_structuredDocument,940));
+        assertEquals("f:someFunc(6)", getELText(_structuredDocument,990));
+        assertEquals("f:someFunc(true)", getELText(_structuredDocument,1036));
+
+        assertEquals("someFunc(6) > 8", getELText(_structuredDocument,1226));
+        assertEquals("someFunc(6)", getELText(_structuredDocument,1274));
+        assertEquals("someFunc(true)", getELText(_structuredDocument,1318));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(967, null);
-        assertNoError(1018, null);
-        assertNoError(1065, null);
+        assertNoError(940, null);
+        assertNoError(990, null);
+        assertNoError(1036, null);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
         // note: this will change to non-error when functions are properly supported
         // by the parser
-        List<IMessage> list = assertSyntaxWarning(1260, 1);
+        List<IMessage> list = assertSyntaxWarning(1226, 1);
         assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID);
 
-        list = assertSyntaxWarning(1309, 1);
+        list = assertSyntaxWarning(1274, 1);
         assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID);
-        
-        list = assertSyntaxWarning(1354, 1);
+
+        list = assertSyntaxWarning(1318, 1);
         assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID);
     }
-    
-    public void testErrorExprs() 
+
+    @Override
+    public void testErrorExprs()
     {
         // no error cases
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LessThanEqTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LessThanEqTestCase.java
index d850ea0..3d3e919 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LessThanEqTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LessThanEqTestCase.java
@@ -13,181 +13,186 @@
  * 
  * @author cbateman
  */
-public class LessThanEqTestCase extends SingleJSPTestCase 
+public class LessThanEqTestCase extends SingleJSPTestCase
 {
 
     public LessThanEqTestCase() {
         super("/testdata/jsps/lessThanEq.jsp.data", "/lessThanEq.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("myBean.stringProperty <= '3'", getELText(_structuredDocument,852));
-        assertEquals("myBean.stringProperty le '3'", getELText(_structuredDocument,914));
-        assertEquals("myBean.integerProperty <= 3", getELText(_structuredDocument,976));
-        assertEquals("myBean.integerProperty le 3", getELText(_structuredDocument,1037));
-        assertEquals("myBean.integerProperty <= '4' ", getELText(_structuredDocument,1098));
-        assertEquals("myBean.integerProperty le '4' ", getELText(_structuredDocument,1162));
-        assertEquals("myBean.comparableProperty <= myBean.collectionProperty", getELText(_structuredDocument,1227));
-        assertEquals("myBean.comparableProperty le myBean.collectionProperty", getELText(_structuredDocument,1315));
-        assertEquals("myBean.integerProperty <= -3", getELText(_structuredDocument,1405));
-        assertEquals("myBean.doubleProperty <= 5", getELText(_structuredDocument,1467));
-        assertEquals("5 le myBean.bigIntegerProperty", getELText(_structuredDocument,1527));
-        assertEquals("myBean.bigDoubleProperty <= myBean.bigIntegerProperty", getELText(_structuredDocument,1591));
-        assertEquals("myBean.coins <= 'quarter'", getELText(_structuredDocument,1678));
-        assertEquals("myBean.coins le 'quarter'", getELText(_structuredDocument,1737));
-        assertEquals("myBean.rawEnum <= 'quarter'", getELText(_structuredDocument,1796));
-        assertEquals("myBean.coinEnum le 'quarter'", getELText(_structuredDocument,1857));
-        assertEquals("myBean.rawEnum <= myBean.coins", getELText(_structuredDocument,1915));
-        assertEquals("myBean.coinEnum <= myBean.colors", getELText(_structuredDocument,1975));
 
-        assertEquals("5 <= 3", getELText(_structuredDocument,2070));
-        assertEquals("5 le 3", getELText(_structuredDocument,2107));
-        assertEquals("'4' <= '34'", getELText(_structuredDocument,2144));
-        assertEquals("'4' le '34'", getELText(_structuredDocument,2186));
-        assertEquals("'34' <= '34'", getELText(_structuredDocument,2228));
-        assertEquals("'34' le '34'", getELText(_structuredDocument,2271));
-        assertEquals("-5 <= 2", getELText(_structuredDocument,2314));
-        assertEquals("-5 le 2", getELText(_structuredDocument,2352));
-        assertEquals("2 <= -5", getELText(_structuredDocument,2390));
-        assertEquals("2 le -5", getELText(_structuredDocument,2428));
-        assertEquals("-5 <= -5", getELText(_structuredDocument,2466));
-        assertEquals("-5 le -5", getELText(_structuredDocument,2505));
-        assertEquals("myBean.integerProperty <= null", getELText(_structuredDocument,2544));
-        assertEquals("null le myBean.integerProperty", getELText(_structuredDocument,2605));
+        assertEquals("myBean.stringProperty <= '3'", getELText(_structuredDocument,827));
+        assertEquals("myBean.stringProperty le '3'", getELText(_structuredDocument,888));
+        assertEquals("myBean.integerProperty <= 3", getELText(_structuredDocument,949));
+        assertEquals("myBean.integerProperty le 3", getELText(_structuredDocument,1009));
+        assertEquals("myBean.integerProperty <= '4' ", getELText(_structuredDocument,1069));
+        assertEquals("myBean.integerProperty le '4' ", getELText(_structuredDocument,1132));
+        assertEquals("myBean.comparableProperty <= myBean.collectionProperty", getELText(_structuredDocument,1196));
+        assertEquals("myBean.comparableProperty le myBean.collectionProperty", getELText(_structuredDocument,1283));
+        assertEquals("myBean.integerProperty <= -3", getELText(_structuredDocument,1370));
+        assertEquals("myBean.doubleProperty <= 5", getELText(_structuredDocument,1431));
+        assertEquals("5 le myBean.bigIntegerProperty", getELText(_structuredDocument,1490));
+        assertEquals("myBean.bigDoubleProperty <= myBean.bigIntegerProperty", getELText(_structuredDocument,1553));
+        assertEquals("myBean.coins <= 'quarter'", getELText(_structuredDocument,1639));
+        assertEquals("myBean.coins le 'quarter'", getELText(_structuredDocument,1697));
+        assertEquals("myBean.rawEnum <= 'quarter'", getELText(_structuredDocument,1755));
+        assertEquals("myBean.coinEnum le 'quarter'", getELText(_structuredDocument,1815));
+        assertEquals("myBean.rawEnum <= myBean.coins", getELText(_structuredDocument,1872));
+        assertEquals("myBean.coinEnum <= myBean.colors", getELText(_structuredDocument,1931));
 
-        assertEquals("5 <= true", getELText(_structuredDocument,2689));
-        assertEquals("5 le true", getELText(_structuredDocument,2729));
-        assertEquals("myBean.integerProperty <= myBean.booleanProperty", getELText(_structuredDocument,2769));
-        assertEquals("myBean.integerProperty le myBean.booleanProperty", getELText(_structuredDocument,2848));
-        assertEquals("myBean.stringArrayProperty <= myBean.booleanProperty", getELText(_structuredDocument,2927));
-        assertEquals("myBean.stringArrayProperty le myBean.booleanProperty", getELText(_structuredDocument,3010));
-        assertEquals("myBean.integerProperty <= true ", getELText(_structuredDocument,3096));
-        assertEquals("myBean.integerProperty le true ", getELText(_structuredDocument,3161));
-        assertEquals("myBean.booleanProperty <= true", getELText(_structuredDocument,3226));
-        assertEquals("myBean.booleanProperty le true", getELText(_structuredDocument,3290));
-        assertEquals("true <= false", getELText(_structuredDocument,3352));
-        assertEquals("true le false", getELText(_structuredDocument,3397));
-        assertEquals("myBean.coins <= myBean.colors", getELText(_structuredDocument,3441));
-        assertEquals("myBean.coins le myBean.colors", getELText(_structuredDocument,3501));
-    }
-    
-    public void testNoErrorExprs() 
-    {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(914, Signature.SIG_BOOLEAN);
-        assertNoError(976, Signature.SIG_BOOLEAN);
-        assertNoError(1037, Signature.SIG_BOOLEAN);
-        assertNoError(1098, Signature.SIG_BOOLEAN);
-        assertNoError(1162, Signature.SIG_BOOLEAN);
-        assertNoError(1227, Signature.SIG_BOOLEAN);
-        assertNoError(1315, Signature.SIG_BOOLEAN);
-        assertNoError(1405, Signature.SIG_BOOLEAN);
-        assertNoError(1467, Signature.SIG_BOOLEAN);
-        assertNoError(1527, Signature.SIG_BOOLEAN);
-        assertNoError(1591, Signature.SIG_BOOLEAN);
-        assertNoError(1678, Signature.SIG_BOOLEAN);
-        assertNoError(1737, Signature.SIG_BOOLEAN);
-        assertNoError(1796, Signature.SIG_BOOLEAN);
-        assertNoError(1857, Signature.SIG_BOOLEAN);
-        assertNoError(1915, Signature.SIG_BOOLEAN);
-        assertNoError(1975, Signature.SIG_BOOLEAN);
+        assertEquals("5 <= 3", getELText(_structuredDocument,2022));
+        assertEquals("5 le 3", getELText(_structuredDocument,2058));
+        assertEquals("'4' <= '34'", getELText(_structuredDocument,2094));
+        assertEquals("'4' le '34'", getELText(_structuredDocument,2135));
+        assertEquals("'34' <= '34'", getELText(_structuredDocument,2176));
+        assertEquals("'34' le '34'", getELText(_structuredDocument,2218));
+        assertEquals("-5 <= 2", getELText(_structuredDocument,2260));
+        assertEquals("-5 le 2", getELText(_structuredDocument,2297));
+        assertEquals("2 <= -5", getELText(_structuredDocument,2334));
+        assertEquals("2 le -5", getELText(_structuredDocument,2371));
+        assertEquals("-5 <= -5", getELText(_structuredDocument,2408));
+        assertEquals("-5 le -5", getELText(_structuredDocument,2446));
+        assertEquals("myBean.integerProperty <= null", getELText(_structuredDocument,2484));
+        assertEquals("null le myBean.integerProperty", getELText(_structuredDocument,2544));
+
+        assertEquals("5 <= true", getELText(_structuredDocument,2625));
+        assertEquals("5 le true", getELText(_structuredDocument,2664));
+        assertEquals("myBean.integerProperty <= myBean.booleanProperty", getELText(_structuredDocument,2703));
+        assertEquals("myBean.integerProperty le myBean.booleanProperty", getELText(_structuredDocument,2781));
+        assertEquals("myBean.stringArrayProperty <= myBean.booleanProperty", getELText(_structuredDocument,2859));
+        assertEquals("myBean.stringArrayProperty le myBean.booleanProperty", getELText(_structuredDocument,2941));
+        assertEquals("myBean.integerProperty <= true ", getELText(_structuredDocument,3026));
+        assertEquals("myBean.integerProperty le true ", getELText(_structuredDocument,3090));
+        assertEquals("myBean.booleanProperty <= true", getELText(_structuredDocument,3154));
+        assertEquals("myBean.booleanProperty le true", getELText(_structuredDocument,3217));
+        assertEquals("true <= false", getELText(_structuredDocument,3278));
+        assertEquals("true le false", getELText(_structuredDocument,3322));
+        assertEquals("myBean.coins <= myBean.colors", getELText(_structuredDocument,3365));
+        assertEquals("myBean.coins le myBean.colors", getELText(_structuredDocument,3424));
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        List<IMessage> list = assertSemanticWarning(2070, Signature.SIG_BOOLEAN, 1);
+        assertNoError(827, Signature.SIG_BOOLEAN);
+        assertNoError(888, Signature.SIG_BOOLEAN);
+        assertNoError(949, Signature.SIG_BOOLEAN);
+        assertNoError(1009, Signature.SIG_BOOLEAN);
+        assertNoError(1069, Signature.SIG_BOOLEAN);
+        assertNoError(1132, Signature.SIG_BOOLEAN);
+        assertNoError(1196, Signature.SIG_BOOLEAN);
+        assertNoError(1283, Signature.SIG_BOOLEAN);
+        assertNoError(1370, Signature.SIG_BOOLEAN);
+        assertNoError(1431, Signature.SIG_BOOLEAN);
+        assertNoError(1490, Signature.SIG_BOOLEAN);
+        assertNoError(1553, Signature.SIG_BOOLEAN);
+        assertNoError(1639, Signature.SIG_BOOLEAN);
+        assertNoError(1697, Signature.SIG_BOOLEAN);
+        assertNoError(1755, Signature.SIG_BOOLEAN);
+        assertNoError(1815, Signature.SIG_BOOLEAN);
+        assertNoError(1872, Signature.SIG_BOOLEAN);
+        assertNoError(1931, Signature.SIG_BOOLEAN);
+    }
+
+    @Override
+    public void testWarningExprs()
+    {
+        List<IMessage> list = assertSemanticWarning(2022, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2107, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2058, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2144, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2094, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2186, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2135, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2228, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2176, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2271, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2218, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2314, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2260, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2352, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2297, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2390, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2334, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2428, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2371, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2466, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2408, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2505, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2446, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
+        list = assertSemanticWarning(2484, Signature.SIG_BOOLEAN, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
+
         list = assertSemanticWarning(2544, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
-
-        list = assertSemanticWarning(2605, Signature.SIG_BOOLEAN, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(2689, null, 1);
+        List<IMessage> list = assertSemanticError(2625, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2729, null, 1);
+        list = assertSemanticError(2664, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2769, null, 1);
+        list = assertSemanticError(2703, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2848, null, 1);
+        list = assertSemanticError(2781, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2927, null, 1);
+        list = assertSemanticError(2859, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3010, null, 1);
+        list = assertSemanticError(2941, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3096, null, 1);
+        list = assertSemanticError(3026, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3161, null, 1);
+        list = assertSemanticError(3090, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3226, null, 1);
+        list = assertSemanticError(3154, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3290, null, 1);
+        list = assertSemanticError(3217, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3352, null, 1);
+        list = assertSemanticError(3278, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3397, null, 1);
+        list = assertSemanticError(3322, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3441, null, 1);
+        list = assertSemanticError(3365, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE_ID);
 
-        list = assertSemanticError(3501, null, 1);
+        list = assertSemanticError(3424, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LessThanTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LessThanTestCase.java
index ae9cd1c..60cde0e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LessThanTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LessThanTestCase.java
@@ -13,185 +13,191 @@
  * 
  * @author cbateman
  */
-public class LessThanTestCase extends SingleJSPTestCase 
+public class LessThanTestCase extends SingleJSPTestCase
 {
-    public LessThanTestCase() 
+    public LessThanTestCase()
     {
         super("/testdata/jsps/lessThan.jsp.data", "/lessThan.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("myBean.stringProperty < '3'", getELText(_structuredDocument,852));
-        assertEquals("myBean.stringProperty lt '3'", getELText(_structuredDocument,913));
-        assertEquals("myBean.integerProperty < 3", getELText(_structuredDocument,975));
-        assertEquals("myBean.integerProperty lt 3", getELText(_structuredDocument,1035));
-        assertEquals("myBean.integerProperty < '4' ", getELText(_structuredDocument,1096));
-        assertEquals("myBean.integerProperty lt '4' ", getELText(_structuredDocument,1159));
-        assertEquals("myBean.comparableProperty < myBean.collectionProperty", getELText(_structuredDocument,1224));
-        assertEquals("myBean.comparableProperty lt myBean.collectionProperty", getELText(_structuredDocument,1311));
-        assertEquals("myBean.integerProperty < -3", getELText(_structuredDocument,1399));
-        assertEquals("myBean.doubleProperty < 5", getELText(_structuredDocument,1460));
-        assertEquals("5 lt myBean.bigIntegerProperty", getELText(_structuredDocument,1519));
-        assertEquals("myBean.bigDoubleProperty < myBean.bigIntegerProperty", getELText(_structuredDocument,1583));
-        assertEquals("myBean.coins < 'quarter'", getELText(_structuredDocument,1669));
-        assertEquals("myBean.coins lt 'quarter'", getELText(_structuredDocument,1727));
-        assertEquals("myBean.rawEnum < 'quarter'", getELText(_structuredDocument,1786));
-        assertEquals("myBean.coinEnum lt 'quarter'", getELText(_structuredDocument,1846));
-        assertEquals("myBean.rawEnum < myBean.coins", getELText(_structuredDocument,1904));
-        assertEquals("myBean.coinEnum < myBean.colors", getELText(_structuredDocument,1963));
 
-        assertEquals("5 < 3", getELText(_structuredDocument,2054));
-        assertEquals("5 lt 3", getELText(_structuredDocument,2090));
-        assertEquals("'4' < '34'", getELText(_structuredDocument,2127));
-        assertEquals("'4' lt '34'", getELText(_structuredDocument,2168));
-        assertEquals("'34' < '34'", getELText(_structuredDocument,2210));
-        assertEquals("'34' lt '34'", getELText(_structuredDocument,2252));
-        assertEquals("-5 < 2", getELText(_structuredDocument,2295));
-        assertEquals("-5 lt 2", getELText(_structuredDocument,2332));
-        assertEquals("2 < -5", getELText(_structuredDocument,2370));
-        assertEquals("2 lt -5", getELText(_structuredDocument,2407));
-        assertEquals("-5 < -5", getELText(_structuredDocument,2445));
-        assertEquals("-5 lt -5", getELText(_structuredDocument,2483));
-        assertEquals("myBean.integerProperty < null", getELText(_structuredDocument,2522));
-        assertEquals("null lt myBean.integerProperty", getELText(_structuredDocument,2582));
+        assertEquals("myBean.stringProperty < '3'", getELText(_structuredDocument,828));
+        assertEquals("myBean.stringProperty lt '3'", getELText(_structuredDocument,888));
+        assertEquals("myBean.integerProperty < 3", getELText(_structuredDocument,949));
+        assertEquals("myBean.integerProperty lt 3", getELText(_structuredDocument,1008));
+        assertEquals("myBean.integerProperty < '4' ", getELText(_structuredDocument,1068));
+        assertEquals("myBean.integerProperty lt '4' ", getELText(_structuredDocument,1130));
+        assertEquals("myBean.comparableProperty < myBean.collectionProperty", getELText(_structuredDocument,1194));
+        assertEquals("myBean.comparableProperty lt myBean.collectionProperty", getELText(_structuredDocument,1280));
+        assertEquals("myBean.integerProperty < -3", getELText(_structuredDocument,1367));
+        assertEquals("myBean.doubleProperty < 5", getELText(_structuredDocument,1427));
+        assertEquals("5 lt myBean.bigIntegerProperty", getELText(_structuredDocument,1485));
+        assertEquals("myBean.bigDoubleProperty < myBean.bigIntegerProperty", getELText(_structuredDocument,1548));
+        assertEquals("myBean.coins < 'quarter'", getELText(_structuredDocument,1633));
+        assertEquals("myBean.coins lt 'quarter'", getELText(_structuredDocument,1690));
+        assertEquals("myBean.rawEnum < 'quarter'", getELText(_structuredDocument,1748));
+        assertEquals("myBean.coinEnum lt 'quarter'", getELText(_structuredDocument,1807));
+        assertEquals("myBean.rawEnum < myBean.coins", getELText(_structuredDocument,1864));
+        assertEquals("myBean.coinEnum < myBean.colors", getELText(_structuredDocument,1922));
 
-        assertEquals("5 < true", getELText(_structuredDocument,2666));
-        assertEquals("5 lt true", getELText(_structuredDocument,2705));
-        assertEquals("myBean.integerProperty < myBean.booleanProperty", getELText(_structuredDocument,2745));
-        assertEquals("myBean.integerProperty lt myBean.booleanProperty", getELText(_structuredDocument,2823));
-        assertEquals("myBean.stringArrayProperty < myBean.booleanProperty", getELText(_structuredDocument,2902));
-        assertEquals("myBean.stringArrayProperty lt myBean.booleanProperty", getELText(_structuredDocument,2984));
-        assertEquals("myBean.integerProperty < true ", getELText(_structuredDocument,3070));
-        assertEquals("myBean.integerProperty lt true ", getELText(_structuredDocument,3134));
-        assertEquals("myBean.booleanProperty < true", getELText(_structuredDocument,3199));
-        assertEquals("myBean.booleanProperty lt true", getELText(_structuredDocument,3262));
-        assertEquals("true < false", getELText(_structuredDocument,3324));
-        assertEquals("true < false", getELText(_structuredDocument,3413));
-        assertEquals("myBean.coins < myBean.colors", getELText(_structuredDocument,3456));
-        assertEquals("myBean.coins lt myBean.colors", getELText(_structuredDocument,3515));
-    }
-    
-    public void testNoErrorExprs() 
-    {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(913, Signature.SIG_BOOLEAN);
-        assertNoError(975, Signature.SIG_BOOLEAN);
-        assertNoError(1035, Signature.SIG_BOOLEAN);
-        assertNoError(1096, Signature.SIG_BOOLEAN);
-        assertNoError(1159, Signature.SIG_BOOLEAN);
-        assertNoError(1224, Signature.SIG_BOOLEAN);
-        assertNoError(1311, Signature.SIG_BOOLEAN);
-        assertNoError(1399, Signature.SIG_BOOLEAN);
-        assertNoError(1460, Signature.SIG_BOOLEAN);
-        assertNoError(1519, Signature.SIG_BOOLEAN);
-        assertNoError(1583, Signature.SIG_BOOLEAN);
-        assertNoError(1669, Signature.SIG_BOOLEAN);
-        assertNoError(1727, Signature.SIG_BOOLEAN);
-        assertNoError(1786, Signature.SIG_BOOLEAN);
-        assertNoError(1846, Signature.SIG_BOOLEAN);
-        assertNoError(1904, Signature.SIG_BOOLEAN);
-        assertNoError(1963, Signature.SIG_BOOLEAN);
+        assertEquals("5 < 3", getELText(_structuredDocument,2010));
+        assertEquals("5 lt 3", getELText(_structuredDocument,2045));
+        assertEquals("'4' < '34'", getELText(_structuredDocument,2081));
+        assertEquals("'4' lt '34'", getELText(_structuredDocument,2121));
+        assertEquals("'34' < '34'", getELText(_structuredDocument,2162));
+        assertEquals("'34' lt '34'", getELText(_structuredDocument,2203));
+        assertEquals("-5 < 2", getELText(_structuredDocument,2245));
+        assertEquals("-5 lt 2", getELText(_structuredDocument,2281));
+        assertEquals("2 < -5", getELText(_structuredDocument,2318));
+        assertEquals("2 lt -5", getELText(_structuredDocument,2354));
+        assertEquals("-5 < -5", getELText(_structuredDocument,2391));
+        assertEquals("-5 lt -5", getELText(_structuredDocument,2428));
+        assertEquals("myBean.integerProperty < null", getELText(_structuredDocument,2466));
+        assertEquals("null lt myBean.integerProperty", getELText(_structuredDocument,2525));
+
+        assertEquals("5 < true", getELText(_structuredDocument,2606));
+        assertEquals("5 lt true", getELText(_structuredDocument,2644));
+        assertEquals("myBean.integerProperty < myBean.booleanProperty", getELText(_structuredDocument,2683));
+        assertEquals("myBean.integerProperty lt myBean.booleanProperty", getELText(_structuredDocument,2760));
+        assertEquals("myBean.stringArrayProperty < myBean.booleanProperty", getELText(_structuredDocument,2838));
+        assertEquals("myBean.stringArrayProperty lt myBean.booleanProperty", getELText(_structuredDocument,2919));
+        assertEquals("myBean.integerProperty < true ", getELText(_structuredDocument,3004));
+        assertEquals("myBean.integerProperty lt true ", getELText(_structuredDocument,3067));
+        assertEquals("myBean.booleanProperty < true", getELText(_structuredDocument,3131));
+        assertEquals("myBean.booleanProperty lt true", getELText(_structuredDocument,3193));
+        assertEquals("true < false", getELText(_structuredDocument,3254));
+        assertEquals("true lt false", getELText(_structuredDocument,3297));
+        assertEquals("true < false", getELText(_structuredDocument,3341));
+        assertEquals("myBean.coins < myBean.colors", getELText(_structuredDocument,3383));
+        assertEquals("myBean.coins lt myBean.colors", getELText(_structuredDocument,3441));
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        List<IMessage> list = assertSemanticWarning(2054, Signature.SIG_BOOLEAN, 1);
+        assertNoError(828, Signature.SIG_BOOLEAN);
+        assertNoError(888, Signature.SIG_BOOLEAN);
+        assertNoError(949, Signature.SIG_BOOLEAN);
+        assertNoError(1008, Signature.SIG_BOOLEAN);
+        assertNoError(1068, Signature.SIG_BOOLEAN);
+        assertNoError(1130, Signature.SIG_BOOLEAN);
+        assertNoError(1194, Signature.SIG_BOOLEAN);
+        assertNoError(1280, Signature.SIG_BOOLEAN);
+        assertNoError(1367, Signature.SIG_BOOLEAN);
+        assertNoError(1427, Signature.SIG_BOOLEAN);
+        assertNoError(1485, Signature.SIG_BOOLEAN);
+        assertNoError(1548, Signature.SIG_BOOLEAN);
+        assertNoError(1633, Signature.SIG_BOOLEAN);
+        assertNoError(1690, Signature.SIG_BOOLEAN);
+        assertNoError(1748, Signature.SIG_BOOLEAN);
+        assertNoError(1807, Signature.SIG_BOOLEAN);
+        assertNoError(1864, Signature.SIG_BOOLEAN);
+        assertNoError(1922, Signature.SIG_BOOLEAN);
+    }
+
+    @Override
+    public void testWarningExprs()
+    {
+        List<IMessage> list = assertSemanticWarning(2010, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2090, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2045, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2127, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2081, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2168, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2121, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2210, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2162, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2252, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2203, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2295, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2245, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2332, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2281, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2370, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2318, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2407, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2354, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2445, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2391, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2483, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2428, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2522, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2466, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2582, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2525, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(2666, null, 1);
+        List<IMessage> list = assertSemanticError(2606, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2705, null, 1);
+        list = assertSemanticError(2644, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2745, null, 1);
+        list = assertSemanticError(2683, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2823, null, 1);
+        list = assertSemanticError(2760, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(2902, null, 1);
+        list = assertSemanticError(2838, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(2984, null, 1);
+        list = assertSemanticError(2919, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3070, null, 1);
+        list = assertSemanticError(3004, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3134, null, 1);
+        list = assertSemanticError(3067, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3199, null, 1);
+        list = assertSemanticError(3131, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3262, null, 1);
+        list = assertSemanticError(3193, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3324, null, 1);
+        list = assertSemanticError(3254, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3368, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
-        
-        list = assertSemanticError(3413, null, 1);
+        list = assertSemanticError(3297, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
 
-        list = assertSemanticError(3456, null, 1);
+        list = assertSemanticError(3341, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID);
+
+        list = assertSemanticError(3383, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE_ID);
 
-        list = assertSemanticError(3515, null, 1);
+        list = assertSemanticError(3441, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LoadBundleResolutionTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LoadBundleResolutionTestCase.java
index 52ecaf4..ac2135e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LoadBundleResolutionTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LoadBundleResolutionTestCase.java
@@ -27,126 +27,133 @@
  * 
  * @author cbateman
  */
-public class LoadBundleResolutionTestCase extends SingleJSPTestCase 
+public class LoadBundleResolutionTestCase extends SingleJSPTestCase
 {
-    public LoadBundleResolutionTestCase() 
+    public LoadBundleResolutionTestCase()
     {
         super("/testdata/jsps/loadBundleResolution.jsp.data", "/loadBundleResolution.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
-        
+
         // add a resource bundle to the default package to test regression on bug 144525
-        TestFileResource resource = new TestFileResource();
-        resource.load(ELValidationTestPlugin.getDefault().getBundle(), 
-                      "/testdata/classes/Bundle.properties.data");
-        _jdtTestEnv.addResourceFile("src", new ByteArrayInputStream(resource.toBytes()), 
-                      "", "Bundle.properties");
+        final TestFileResource resource = new TestFileResource();
+        resource.load(ELValidationTestPlugin.getDefault().getBundle(),
+        "/testdata/classes/Bundle.properties.data");
+        _jdtTestEnv.addResourceFile("src", new ByteArrayInputStream(resource.toBytes()),
+                "", "Bundle.properties");
 
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("bundle.bundleProp2", getELText(_structuredDocument,1031));
-        assertEquals("noPackageBundle.bundleProp2", getELText(_structuredDocument,1080));
-        assertEquals("bundle.bundleProp1 && myBean.stringProperty", getELText(_structuredDocument,1141));
-        assertEquals("empty bundle", getELText(_structuredDocument,1218));
-        assertEquals("empty bundle.bundleProp2", getELText(_structuredDocument,1264));
-        assertEquals("bundle.bundleProp2 + 5", getELText(_structuredDocument,1322));
-        assertEquals("bundleProp2", getELText(_structuredDocument,1375));
-        assertEquals("bundle.x.y", getELText(_structuredDocument,1417));
-        assertEquals("noPackageBundle.x.y", getELText(_structuredDocument,1458));
-        
-        assertEquals("-bundle.bundleProp1", getELText(_structuredDocument,1535));
-        assertEquals("bundle.bundleProp3", getELText(_structuredDocument,1588));
-        assertEquals("msg", getELText(_structuredDocument,1640));
-        assertEquals("bundle.x", getELText(_structuredDocument,1677));
-        assertEquals("noPackageBundle.notAProperty", getELText(_structuredDocument,1716));
+        assertEquals("bundle.bundleProp2", getELText(_structuredDocument,1003));
+        assertEquals("noPackageBundle.bundleProp2", getELText(_structuredDocument,1051));
+        assertEquals("bundle.bundleProp1 && myBean.stringProperty", getELText(_structuredDocument,1111));
+        assertEquals("empty bundle", getELText(_structuredDocument,1187));
+        assertEquals("empty bundle.bundleProp2", getELText(_structuredDocument,1232));
+        assertEquals("bundle.bundleProp2 + 5", getELText(_structuredDocument,1289));
+        assertEquals("bundleProp2", getELText(_structuredDocument,1341));
+        assertEquals("bundle.x.y", getELText(_structuredDocument,1382));
+        assertEquals("noPackageBundle.x.y", getELText(_structuredDocument,1422));
+
+        assertEquals("-bundle.bundleProp1", getELText(_structuredDocument,1496));
+        assertEquals("bundle.bundleProp3", getELText(_structuredDocument,1548));
+        assertEquals("msg", getELText(_structuredDocument,1599));
+        assertEquals("bundle.x", getELText(_structuredDocument,1635));
+        assertEquals("noPackageBundle.notAProperty", getELText(_structuredDocument,1673));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(1031, TypeConstants.TYPE_STRING);
-        assertNoError(1080, TypeConstants.TYPE_STRING);
-        assertNoError(1141, Signature.SIG_BOOLEAN);
-        assertNoError(1218, Signature.SIG_BOOLEAN);
-        assertNoError(1264, Signature.SIG_BOOLEAN);
-        assertNoError(1322, Signature.SIG_LONG);
-        //assertNoError(1375, TypeConstants.TYPE_STRING);
-        assertNoError(1417, TypeConstants.TYPE_STRING);
-        assertNoError(1458, TypeConstants.TYPE_STRING);
+        assertNoError(1003, TypeConstants.TYPE_STRING);
+        assertNoError(1051, TypeConstants.TYPE_STRING);
+        assertNoError(1111, Signature.SIG_BOOLEAN);
+        assertNoError(1187, Signature.SIG_BOOLEAN);
+        assertNoError(1232, Signature.SIG_BOOLEAN);
+        assertNoError(1289, Signature.SIG_LONG);
+        //assertNoError(1341, TypeConstants.TYPE_STRING);
+        assertNoError(1382, TypeConstants.TYPE_STRING);
         // see  https://bugs.eclipse.org/bugs/show_bug.cgi?id=190671
-        assertNoError(1640, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1422, TypeConstants.TYPE_STRING);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1535, Signature.SIG_LONG, 1);
+        List<IMessage> list = assertSemanticWarning(1496, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED_ID);
 
-        list = assertSemanticWarning(1588, null, 1);
+        list = assertSemanticWarning(1548, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
         // ensure that we are validating that the basename for the missing bundle
         // is being validated since the related variable will not be flagged
-        // this check replaces a previous check at 1640 for a variable not 
+        // this check replaces a previous check at 1640 for a variable not
         // found warning. Rather than marking loadBundle variables bad when
         // we can't find the variable, we now mark the basename bad instead
         // of the variable
         // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=190671
         ensureMissingBundleValidation();
-        
-        list = assertSemanticWarning(1677, null, 1);
+
+        list = assertSemanticWarning(1635, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_IS_INTERMEDIATE_ID);
-        
-        list = assertSemanticWarning(1716, null, 1);
+
+        list = assertSemanticWarning(1673, null, 1);
         assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
         // no error
     }
-    
-        
+
+
     @SuppressWarnings("unchecked")
-	private void ensureMissingBundleValidation()
+    private void ensureMissingBundleValidation()
     {
-        final IStructuredDocumentContext context = 
-            IStructuredDocumentContextFactory.INSTANCE.getContext(_structuredDocument, 872);
+        final IStructuredDocumentContext context =
+            IStructuredDocumentContextFactory.INSTANCE.getContext(_structuredDocument, 839);
 
         final IDOMContextResolver contextResolver =
-        	IStructuredDocumentContextResolverFactory.INSTANCE.getDOMContextResolver(context);
-        
+            IStructuredDocumentContextResolverFactory.INSTANCE.getDOMContextResolver(context);
+
         final Attr attr = (Attr) contextResolver.getNode();
         String attributeVal = attr.getValue();
         assertEquals("TestMessages", attributeVal);
         assertEquals(IJSFConstants.ATTR_BASENAME, attr.getLocalName());
-        
-        // verify that attribute value validation is picking up on missing bundles
-		List vv = 
-			MetaDataEnabledProcessingFactory.getInstance()
-				.getAttributeValueRuntimeTypeFeatureProcessors
-					(IValidValues.class, context, ITLDConstants.URI_JSF_CORE
-						, IJSFConstants.TAG_LOADBUNDLE, IJSFConstants.ATTR_BASENAME);
 
-		boolean validatesMissingBundle = false;
-		
-		for (Iterator it = vv.iterator();it.hasNext();)
-		{
-			IValidValues v = (IValidValues)it.next();
-			if (attributeVal == null) attributeVal = "";//ensure to be non-null
-			if (!v.isValidValue(attributeVal.trim())){	
-				if (v.getValidationMessages().size() > 0)
-				{
-					validatesMissingBundle = true;
-					break;
-				}
-			}
-		}
-		
-		assertTrue(validatesMissingBundle);
+        // verify that attribute value validation is picking up on missing bundles
+        final List vv =
+            MetaDataEnabledProcessingFactory.getInstance()
+            .getAttributeValueRuntimeTypeFeatureProcessors
+            (IValidValues.class, context, ITLDConstants.URI_JSF_CORE
+                    , IJSFConstants.TAG_LOADBUNDLE, IJSFConstants.ATTR_BASENAME);
+
+        boolean validatesMissingBundle = false;
+
+        for (final Iterator it = vv.iterator();it.hasNext();)
+        {
+            final IValidValues v = (IValidValues)it.next();
+            if (attributeVal == null)
+            {
+                attributeVal = "";//ensure to be non-null
+            }
+            if (!v.isValidValue(attributeVal.trim())){
+                if (v.getValidationMessages().size() > 0)
+                {
+                    validatesMissingBundle = true;
+                    break;
+                }
+            }
+        }
+
+        assertTrue(validatesMissingBundle);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalAndTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalAndTestCase.java
index 1a3d757..3c434e6 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalAndTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalAndTestCase.java
@@ -20,98 +20,103 @@
         super("/testdata/jsps/logicalAND.jsp.data", "/logicalAND.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("myBean.booleanProperty && myBean.booleanProperty", getELText(_structuredDocument,852));
-        assertEquals("myBean.booleanProperty and myBean.booleanProperty", getELText(_structuredDocument,934));
-        assertEquals("myBean.booleanProperty && true ", getELText(_structuredDocument,1014));
-        assertEquals("myBean.booleanProperty and true ", getELText(_structuredDocument,1076));
-        assertEquals("'true' && myBean.booleanProperty", getELText(_structuredDocument,1142));
-        assertEquals("'true' and myBean.booleanProperty", getELText(_structuredDocument,1209));
+        assertEquals("myBean.booleanProperty && myBean.booleanProperty", getELText(_structuredDocument,828));
+        assertEquals("myBean.booleanProperty and myBean.booleanProperty", getELText(_structuredDocument,909));
+        assertEquals("myBean.booleanProperty && true ", getELText(_structuredDocument,988));
+        assertEquals("myBean.booleanProperty and true ", getELText(_structuredDocument,1049));
+        assertEquals("'true' && myBean.booleanProperty", getELText(_structuredDocument,1114));
+        assertEquals("'true' and myBean.booleanProperty", getELText(_structuredDocument,1180));
 
-        assertEquals("false && myBean.booleanProperty", getELText(_structuredDocument,1301));
-        assertEquals("false and myBean.booleanProperty", getELText(_structuredDocument,1366));
-        assertEquals("null && myBean.booleanProperty ", getELText(_structuredDocument,1432));
-        assertEquals("null and myBean.booleanProperty ", getELText(_structuredDocument,1497));
-        assertEquals("'notTrue' && myBean.booleanProperty", getELText(_structuredDocument,1563));
-        assertEquals("myBean.booleanProperty && false", getELText(_structuredDocument,1636));
-        assertEquals("myBean.booleanProperty and false", getELText(_structuredDocument,1701));
-        assertEquals("myBean.booleanProperty && null ", getELText(_structuredDocument,1767));
-        assertEquals("myBean.booleanProperty and null", getELText(_structuredDocument,1832));
-        assertEquals("myBean.booleanProperty && 'notTrue'", getELText(_structuredDocument,1897));
-        assertEquals("true && false", getELText(_structuredDocument,1965));
-        assertEquals("null && true", getELText(_structuredDocument,2009));
-        
-        assertEquals("myBean.integerProperty && true", getELText(_structuredDocument,2084));
-        assertEquals("true && myBean.integerProperty", getELText(_structuredDocument,2148));
-        assertEquals("4 && true", getELText(_structuredDocument,2212));
-    }
-    
+        assertEquals("false && myBean.booleanProperty", getELText(_structuredDocument,1269));
+        assertEquals("false and myBean.booleanProperty", getELText(_structuredDocument,1333));
+        assertEquals("null && myBean.booleanProperty ", getELText(_structuredDocument,1398));
+        assertEquals("null and myBean.booleanProperty ", getELText(_structuredDocument,1462));
+        assertEquals("'notTrue' && myBean.booleanProperty", getELText(_structuredDocument,1527));
+        assertEquals("myBean.booleanProperty && false", getELText(_structuredDocument,1598));
+        assertEquals("myBean.booleanProperty and false", getELText(_structuredDocument,1662));
+        assertEquals("myBean.booleanProperty && null ", getELText(_structuredDocument,1727));
+        assertEquals("myBean.booleanProperty and null", getELText(_structuredDocument,1791));
+        assertEquals("myBean.booleanProperty && 'notTrue'", getELText(_structuredDocument,1855));
+        assertEquals("true && false", getELText(_structuredDocument,1922));
+        assertEquals("null && true", getELText(_structuredDocument,1965));
 
-
-    public void testNoErrorExprs() 
-    {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(934, Signature.SIG_BOOLEAN);
-        assertNoError(1014, Signature.SIG_BOOLEAN);
-        assertNoError(1076, Signature.SIG_BOOLEAN);
-        assertNoError(1142, Signature.SIG_BOOLEAN);
-        assertNoError(1209, Signature.SIG_BOOLEAN);
+        assertEquals("myBean.integerProperty && true", getELText(_structuredDocument,2037));
+        assertEquals("true && myBean.integerProperty", getELText(_structuredDocument,2100));
+        assertEquals("4 && true", getELText(_structuredDocument,2163));
     }
 
-    public void testWarningExprs() 
+
+
+    @Override
+    public void testNoErrorExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1301, Signature.SIG_BOOLEAN, 1);
+        assertNoError(828, Signature.SIG_BOOLEAN);
+        assertNoError(909, Signature.SIG_BOOLEAN);
+        assertNoError(988, Signature.SIG_BOOLEAN);
+        assertNoError(1049, Signature.SIG_BOOLEAN);
+        assertNoError(1114, Signature.SIG_BOOLEAN);
+        assertNoError(1180, Signature.SIG_BOOLEAN);
+    }
+
+    @Override
+    public void testWarningExprs()
+    {
+        List<IMessage> list = assertSemanticWarning(1269, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(1366, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1333, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(1432, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1398, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(1497, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1462, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(1563, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1527, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(1636, Signature.SIG_BOOLEAN, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(1701, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1598, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1767, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1662, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1832, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1727, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1897, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1791, Signature.SIG_BOOLEAN, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
+
+        list = assertSemanticWarning(1855, Signature.SIG_BOOLEAN, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
+
+        list = assertSemanticWarning(1922, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
 
         list = assertSemanticWarning(1965, Signature.SIG_BOOLEAN, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
-
-        list = assertSemanticWarning(2009, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(2084, null, 1);
+        List<IMessage> list = assertSemanticError(2037, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(2148, null, 1);
+        list = assertSemanticError(2100, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(2212, null, 1);
+        list = assertSemanticError(2163, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalEqualsTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalEqualsTestCase.java
index 9c135b7..17ecaf8 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalEqualsTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalEqualsTestCase.java
@@ -13,191 +13,196 @@
  * 
  * @author cbateman
  */
-public class LogicalEqualsTestCase extends SingleJSPTestCase 
+public class LogicalEqualsTestCase extends SingleJSPTestCase
 {
-    public LogicalEqualsTestCase() 
+    public LogicalEqualsTestCase()
     {
         super("/testdata/jsps/logicalEquals.jsp.data", "/logicalEquals.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("myBean.stringProperty == '3'", getELText(_structuredDocument,852));
-        assertEquals("myBean.stringProperty eq '3'", getELText(_structuredDocument,914));
-        assertEquals("myBean.integerProperty == 3", getELText(_structuredDocument,976));
-        assertEquals("myBean.integerProperty eq 3", getELText(_structuredDocument,1037));
-        assertEquals("myBean.booleanProperty == true", getELText(_structuredDocument,1098));
-        assertEquals("myBean.booleanProperty eq true", getELText(_structuredDocument,1162));
-        assertEquals("myBean.integerProperty == '4' ", getELText(_structuredDocument,1226));
-        assertEquals("myBean.integerProperty eq '4' ", getELText(_structuredDocument,1290));
-        assertEquals("myBean.bigDoubleProperty == 4.5", getELText(_structuredDocument,1354));
-        assertEquals("myBean.doubleProperty eq 67", getELText(_structuredDocument,1419));
-        assertEquals("myBean.bigIntegerProperty == 500", getELText(_structuredDocument,1480));
-        assertEquals("myBean.stringArrayProperty == '3'", getELText(_structuredDocument,1546));
-        assertEquals("myBean.stringArrayProperty eq myBean.listProperty", getELText(_structuredDocument,1613));
-        assertEquals("myBean.coins == 'dime'", getELText(_structuredDocument,1692));
-        assertEquals("myBean.coins eq 'dime'", getELText(_structuredDocument,1745));
-        assertEquals("myBean.colors == 'red'", getELText(_structuredDocument,1798));
-        assertEquals("myBean.colors eq 'red'", getELText(_structuredDocument,1850));
-        assertEquals("myBean.coins == myBean.stringProperty", getELText(_structuredDocument,1902));
-        assertEquals("myBean.coins eq myBean.stringProperty", getELText(_structuredDocument,1969));
-        assertEquals("myBean.rawEnum == 'red'", getELText(_structuredDocument,2036));
-        assertEquals("myBean.coinEnum == myBean.coins", getELText(_structuredDocument,2089));
+        assertEquals("myBean.stringProperty == '3'", getELText(_structuredDocument,828));
+        assertEquals("myBean.stringProperty eq '3'", getELText(_structuredDocument,889));
+        assertEquals("myBean.integerProperty == 3", getELText(_structuredDocument,950));
+        assertEquals("myBean.integerProperty eq 3", getELText(_structuredDocument,1010));
+        assertEquals("myBean.booleanProperty == true", getELText(_structuredDocument,1070));
+        assertEquals("myBean.booleanProperty eq true", getELText(_structuredDocument,1133));
+        assertEquals("myBean.integerProperty == '4' ", getELText(_structuredDocument,1196));
+        assertEquals("myBean.integerProperty eq '4' ", getELText(_structuredDocument,1259));
+        assertEquals("myBean.bigDoubleProperty == 4.5", getELText(_structuredDocument,1322));
+        assertEquals("myBean.doubleProperty eq 67", getELText(_structuredDocument,1386));
+        assertEquals("myBean.bigIntegerProperty == 500", getELText(_structuredDocument,1446));
+        assertEquals("myBean.stringArrayProperty == '3'", getELText(_structuredDocument,1511));
+        assertEquals("myBean.stringArrayProperty eq myBean.listProperty", getELText(_structuredDocument,1577));
+        assertEquals("myBean.coins == 'dime'", getELText(_structuredDocument,1655));
+        assertEquals("myBean.coins eq 'dime'", getELText(_structuredDocument,1707));
+        assertEquals("myBean.colors == 'red'", getELText(_structuredDocument,1759));
+        assertEquals("myBean.colors eq 'red'", getELText(_structuredDocument,1810));
+        assertEquals("myBean.coins == myBean.stringProperty", getELText(_structuredDocument,1861));
+        assertEquals("myBean.coins eq myBean.stringProperty", getELText(_structuredDocument,1927));
+        assertEquals("myBean.rawEnum == 'red'", getELText(_structuredDocument,1993));
+        assertEquals("myBean.coinEnum == myBean.coins", getELText(_structuredDocument,2045));
 
-        assertEquals("5 == 3", getELText(_structuredDocument,2175));
-        assertEquals("5 eq 3", getELText(_structuredDocument,2212));
-        assertEquals("true == false", getELText(_structuredDocument,2249));
-        assertEquals("true eq false", getELText(_structuredDocument,2293));
-        assertEquals("'4' == '34'", getELText(_structuredDocument,2337));
-        assertEquals("'4' eq '34'", getELText(_structuredDocument,2379));
-        assertEquals("'34' == '34'", getELText(_structuredDocument,2421));
-        assertEquals("'34' eq '34'", getELText(_structuredDocument,2464));
-        assertEquals("myBean.integerProperty == null", getELText(_structuredDocument,2507));
-        assertEquals("null eq myBean.integerProperty", getELText(_structuredDocument,2568));
-        assertEquals("5.4 == 4.3", getELText(_structuredDocument,2629));
-        assertEquals("true == true", getELText(_structuredDocument,2670));
-        assertEquals("myBean.coins == 'notAValue'", getELText(_structuredDocument,2713));
-        assertEquals("myBean.coins eq 'notAValue'", getELText(_structuredDocument,2771));
-        assertEquals("myBean.coins == 'notAValue' && myBean.coins == 'dime'", getELText(_structuredDocument,2829));
-        assertEquals("myBean.coins eq 'notAValue' && myBean.coins eq 'dime'", getELText(_structuredDocument,2913));
-        assertEquals("myBean.coins == myBean.colors", getELText(_structuredDocument,2997));
-        assertEquals("myBean.coins == myBean.stringArrayProperty", getELText(_structuredDocument,3057));
-        assertEquals("'blah' == myBean.coins", getELText(_structuredDocument,3130));
-        assertEquals("myBean.coins eq 'blah'", getELText(_structuredDocument,3183));
+        assertEquals("5 == 3", getELText(_structuredDocument,2128));
+        assertEquals("5 eq 3", getELText(_structuredDocument,2164));
+        assertEquals("true == false", getELText(_structuredDocument,2200));
+        assertEquals("true eq false", getELText(_structuredDocument,2243));
+        assertEquals("'4' == '34'", getELText(_structuredDocument,2286));
+        assertEquals("'4' eq '34'", getELText(_structuredDocument,2327));
+        assertEquals("'34' == '34'", getELText(_structuredDocument,2368));
+        assertEquals("'34' eq '34'", getELText(_structuredDocument,2410));
+        assertEquals("myBean.integerProperty == null", getELText(_structuredDocument,2452));
+        assertEquals("null eq myBean.integerProperty", getELText(_structuredDocument,2512));
+        assertEquals("5.4 == 4.3", getELText(_structuredDocument,2572));
+        assertEquals("true == true", getELText(_structuredDocument,2612));
+        assertEquals("myBean.coins == 'notAValue'", getELText(_structuredDocument,2654));
+        assertEquals("myBean.coins eq 'notAValue'", getELText(_structuredDocument,2711));
+        assertEquals("myBean.coins == 'notAValue' && myBean.coins == 'dime'", getELText(_structuredDocument,2768));
+        assertEquals("myBean.coins eq 'notAValue' && myBean.coins eq 'dime'", getELText(_structuredDocument,2851));
+        assertEquals("myBean.coins == myBean.colors", getELText(_structuredDocument,2934));
+        assertEquals("myBean.coins == myBean.stringArrayProperty", getELText(_structuredDocument,2993));
+        assertEquals("'blah' == myBean.coins", getELText(_structuredDocument,3065));
+        assertEquals("myBean.coins eq 'blah'", getELText(_structuredDocument,3117));
 
-        assertEquals("5 == true", getELText(_structuredDocument,3257));
-        assertEquals("5 eq true", getELText(_structuredDocument,3297));
-        assertEquals("myBean.integerProperty == myBean.booleanProperty", getELText(_structuredDocument,3337));
-        assertEquals("myBean.integerProperty eq myBean.booleanProperty", getELText(_structuredDocument,3416));
-        assertEquals("myBean.stringArrayProperty == myBean.booleanProperty", getELText(_structuredDocument,3495));
-        assertEquals("myBean.booleanProperty eq myBean.stringArrayProperty", getELText(_structuredDocument,3578));
-        assertEquals("myBean.integerProperty == true ", getELText(_structuredDocument,3664));
-        assertEquals("myBean.integerProperty eq true ", getELText(_structuredDocument,3729));
-        assertEquals("false == myBean.integerProperty", getELText(_structuredDocument,3794));    
+        assertEquals("5 == true", getELText(_structuredDocument,3188));
+        assertEquals("5 eq true", getELText(_structuredDocument,3227));
+        assertEquals("myBean.integerProperty == myBean.booleanProperty", getELText(_structuredDocument,3266));
+        assertEquals("myBean.integerProperty eq myBean.booleanProperty", getELText(_structuredDocument,3344));
+        assertEquals("myBean.stringArrayProperty == myBean.booleanProperty", getELText(_structuredDocument,3422));
+        assertEquals("myBean.booleanProperty eq myBean.stringArrayProperty", getELText(_structuredDocument,3504));
+        assertEquals("myBean.integerProperty == true ", getELText(_structuredDocument,3589));
+        assertEquals("myBean.integerProperty eq true ", getELText(_structuredDocument,3653));
+        assertEquals("false == myBean.integerProperty", getELText(_structuredDocument,3717));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(914, Signature.SIG_BOOLEAN);
-        assertNoError(976, Signature.SIG_BOOLEAN);
-        assertNoError(1037, Signature.SIG_BOOLEAN);
-        assertNoError(1098, Signature.SIG_BOOLEAN);
-        assertNoError(1162, Signature.SIG_BOOLEAN);
-        assertNoError(1226, Signature.SIG_BOOLEAN);
-        assertNoError(1290, Signature.SIG_BOOLEAN);
-        assertNoError(1354, Signature.SIG_BOOLEAN);
-        assertNoError(1419, Signature.SIG_BOOLEAN);
-        assertNoError(1480, Signature.SIG_BOOLEAN);
-        assertNoError(1546, Signature.SIG_BOOLEAN);
-        assertNoError(1613, Signature.SIG_BOOLEAN);
-        assertNoError(1692, Signature.SIG_BOOLEAN);
-        assertNoError(1745, Signature.SIG_BOOLEAN);
-        assertNoError(1798, Signature.SIG_BOOLEAN);
-        assertNoError(1850, Signature.SIG_BOOLEAN);
-        assertNoError(1902, Signature.SIG_BOOLEAN);
-        assertNoError(1969, Signature.SIG_BOOLEAN);
-        assertNoError(2036, Signature.SIG_BOOLEAN);
-        assertNoError(2089, Signature.SIG_BOOLEAN);
+        assertNoError(828, Signature.SIG_BOOLEAN);
+        assertNoError(889, Signature.SIG_BOOLEAN);
+        assertNoError(950, Signature.SIG_BOOLEAN);
+        assertNoError(1010, Signature.SIG_BOOLEAN);
+        assertNoError(1070, Signature.SIG_BOOLEAN);
+        assertNoError(1133, Signature.SIG_BOOLEAN);
+        assertNoError(1196, Signature.SIG_BOOLEAN);
+        assertNoError(1259, Signature.SIG_BOOLEAN);
+        assertNoError(1322, Signature.SIG_BOOLEAN);
+        assertNoError(1386, Signature.SIG_BOOLEAN);
+        assertNoError(1446, Signature.SIG_BOOLEAN);
+        assertNoError(1511, Signature.SIG_BOOLEAN);
+        assertNoError(1577, Signature.SIG_BOOLEAN);
+        assertNoError(1655, Signature.SIG_BOOLEAN);
+        assertNoError(1707, Signature.SIG_BOOLEAN);
+        assertNoError(1759, Signature.SIG_BOOLEAN);
+        assertNoError(1810, Signature.SIG_BOOLEAN);
+        assertNoError(1861, Signature.SIG_BOOLEAN);
+        assertNoError(1927, Signature.SIG_BOOLEAN);
+        assertNoError(1993, Signature.SIG_BOOLEAN);
+        assertNoError(2045, Signature.SIG_BOOLEAN);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(2175, Signature.SIG_BOOLEAN, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(2212, Signature.SIG_BOOLEAN, 1);
+        List<IMessage> list = assertSemanticWarning(2128, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2249, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2164, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2293, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2200, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2337, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2243, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2379, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2286, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2421, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2327, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2464, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2368, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2507, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2410, Signature.SIG_BOOLEAN, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
+
+        list = assertSemanticWarning(2452, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2568, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2512, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2629, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2572, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2670, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2612, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2713, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2654, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
 
-        list = assertSemanticWarning(2771, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2711, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
 
-        list = assertSemanticWarning(2829, Signature.SIG_BOOLEAN, 2);
+        list = assertSemanticWarning(2768, Signature.SIG_BOOLEAN, 2);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(2913, Signature.SIG_BOOLEAN, 2);
+        list = assertSemanticWarning(2851, Signature.SIG_BOOLEAN, 2);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(2997, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2934, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
 
-        list = assertSemanticWarning(3057, Signature.SIG_BOOLEAN, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
-        
-        list = assertSemanticWarning(3130, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2993, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
 
-        list = assertSemanticWarning(3183, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(3065, Signature.SIG_BOOLEAN, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
+
+        list = assertSemanticWarning(3117, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(3257, null, 1);
+        List<IMessage> list = assertSemanticError(3188, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3297, null, 1);
+        list = assertSemanticError(3227, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3337, null, 1);
+        list = assertSemanticError(3266, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3416, null, 1);
+        list = assertSemanticError(3344, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3495, null, 1);
+        list = assertSemanticError(3422, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(3578, null, 1);
+        list = assertSemanticError(3504, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(3664, null, 1);
+        list = assertSemanticError(3589, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3729, null, 1);
+        list = assertSemanticError(3653, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(3794, null, 1);
+
+        list = assertSemanticError(3717, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalNotEqualsTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalNotEqualsTestCase.java
index ad2b6a7..91d5068 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalNotEqualsTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalNotEqualsTestCase.java
@@ -13,179 +13,184 @@
  * 
  * @author cbateman
  */
-public class LogicalNotEqualsTestCase extends SingleJSPTestCase 
+public class LogicalNotEqualsTestCase extends SingleJSPTestCase
 {
     public LogicalNotEqualsTestCase()
     {
         super("/testdata/jsps/logicalNotEquals.jsp.data", "/logicalNotEquals.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("myBean.stringProperty != '3'", getELText(_structuredDocument,852));
-        assertEquals("myBean.stringProperty ne '3'", getELText(_structuredDocument,914));
-        assertEquals("myBean.integerProperty != 3", getELText(_structuredDocument,976));
-        assertEquals("myBean.integerProperty ne 3", getELText(_structuredDocument,1037));
-        assertEquals("myBean.booleanProperty != true", getELText(_structuredDocument,1098));
-        assertEquals("myBean.booleanProperty ne true", getELText(_structuredDocument,1162));
-        assertEquals("myBean.integerProperty != '4' ", getELText(_structuredDocument,1226));
-        assertEquals("myBean.integerProperty ne '4' ", getELText(_structuredDocument,1290));
-        assertEquals("myBean.bigDoubleProperty != 4.5", getELText(_structuredDocument,1354));
-        assertEquals("myBean.doubleProperty ne 67", getELText(_structuredDocument,1419));
-        assertEquals("myBean.bigIntegerProperty != 500", getELText(_structuredDocument,1480));
-        assertEquals("myBean.stringArrayProperty != '3'", getELText(_structuredDocument,1546));
-        assertEquals("myBean.stringArrayProperty ne myBean.listProperty", getELText(_structuredDocument,1613));
-        assertEquals("myBean.coins != 'dime'", getELText(_structuredDocument,1692));
-        assertEquals("myBean.coins ne 'dime'", getELText(_structuredDocument,1745));
-        assertEquals("myBean.colors != 'red'", getELText(_structuredDocument,1798));
-        assertEquals("myBean.colors ne 'red'", getELText(_structuredDocument,1850));
-        assertEquals("myBean.coins != myBean.stringProperty", getELText(_structuredDocument,1902));
-        assertEquals("myBean.coins ne myBean.stringProperty", getELText(_structuredDocument,1969));
-        assertEquals("myBean.rawEnum != 'red'", getELText(_structuredDocument,2036));
-        assertEquals("myBean.coinEnum ne myBean.coins", getELText(_structuredDocument,2089));
+        assertEquals("myBean.stringProperty != '3'", getELText(_structuredDocument,828));
+        assertEquals("myBean.stringProperty ne '3'", getELText(_structuredDocument,889));
+        assertEquals("myBean.integerProperty != 3", getELText(_structuredDocument,950));
+        assertEquals("myBean.integerProperty ne 3", getELText(_structuredDocument,1010));
+        assertEquals("myBean.booleanProperty != true", getELText(_structuredDocument,1070));
+        assertEquals("myBean.booleanProperty ne true", getELText(_structuredDocument,1133));
+        assertEquals("myBean.integerProperty != '4' ", getELText(_structuredDocument,1196));
+        assertEquals("myBean.integerProperty ne '4' ", getELText(_structuredDocument,1259));
+        assertEquals("myBean.bigDoubleProperty != 4.5", getELText(_structuredDocument,1322));
+        assertEquals("myBean.doubleProperty ne 67", getELText(_structuredDocument,1386));
+        assertEquals("myBean.bigIntegerProperty != 500", getELText(_structuredDocument,1446));
+        assertEquals("myBean.stringArrayProperty != '3'", getELText(_structuredDocument,1511));
+        assertEquals("myBean.stringArrayProperty ne myBean.listProperty", getELText(_structuredDocument,1577));
+        assertEquals("myBean.coins != 'dime'", getELText(_structuredDocument,1655));
+        assertEquals("myBean.coins ne 'dime'", getELText(_structuredDocument,1707));
+        assertEquals("myBean.colors != 'red'", getELText(_structuredDocument,1759));
+        assertEquals("myBean.colors ne 'red'", getELText(_structuredDocument,1810));
+        assertEquals("myBean.coins != myBean.stringProperty", getELText(_structuredDocument,1861));
+        assertEquals("myBean.coins ne myBean.stringProperty", getELText(_structuredDocument,1927));
+        assertEquals("myBean.rawEnum != 'red'", getELText(_structuredDocument,1993));
+        assertEquals("myBean.coinEnum ne myBean.coins", getELText(_structuredDocument,2045));
 
-        assertEquals("5 != 3", getELText(_structuredDocument,2175));
-        assertEquals("5 ne 3", getELText(_structuredDocument,2212));
-        assertEquals("true != false", getELText(_structuredDocument,2249));
-        assertEquals("true ne false", getELText(_structuredDocument,2293));
-        assertEquals("'4' != '34'", getELText(_structuredDocument,2337));
-        assertEquals("'4' ne '34'", getELText(_structuredDocument,2379));
-        assertEquals("'34' != '34'", getELText(_structuredDocument,2421));
-        assertEquals("'34' ne '34'", getELText(_structuredDocument,2464));
-        assertEquals("myBean.integerProperty != null", getELText(_structuredDocument,2507));
-        assertEquals("null ne myBean.integerProperty", getELText(_structuredDocument,2568));
-        assertEquals("5.4 != 4.3", getELText(_structuredDocument,2629));
-        assertEquals("true != true", getELText(_structuredDocument,2670));
-        assertEquals("myBean.coins != 'notAValue'", getELText(_structuredDocument,2713));
-        assertEquals("myBean.coins ne 'notAValue'", getELText(_structuredDocument,2771));
-        assertEquals("myBean.coins != 'notAValue' || myBean.coins != 'dime'", getELText(_structuredDocument,2829));
-        assertEquals("myBean.coins ne 'notAValue' || myBean.coins ne 'dime'", getELText(_structuredDocument,2913));
-        assertEquals("myBean.coins != myBean.colors", getELText(_structuredDocument,2997));
+        assertEquals("5 != 3", getELText(_structuredDocument,2128));
+        assertEquals("5 ne 3", getELText(_structuredDocument,2164));
+        assertEquals("true != false", getELText(_structuredDocument,2200));
+        assertEquals("true ne false", getELText(_structuredDocument,2243));
+        assertEquals("'4' != '34'", getELText(_structuredDocument,2286));
+        assertEquals("'4' ne '34'", getELText(_structuredDocument,2327));
+        assertEquals("'34' != '34'", getELText(_structuredDocument,2368));
+        assertEquals("'34' ne '34'", getELText(_structuredDocument,2410));
+        assertEquals("myBean.integerProperty != null", getELText(_structuredDocument,2452));
+        assertEquals("null ne myBean.integerProperty", getELText(_structuredDocument,2512));
+        assertEquals("5.4 != 4.3", getELText(_structuredDocument,2572));
+        assertEquals("true != true", getELText(_structuredDocument,2612));
+        assertEquals("myBean.coins != 'notAValue'", getELText(_structuredDocument,2654));
+        assertEquals("myBean.coins ne 'notAValue'", getELText(_structuredDocument,2711));
+        assertEquals("myBean.coins != 'notAValue' || myBean.coins != 'dime'", getELText(_structuredDocument,2768));
+        assertEquals("myBean.coins ne 'notAValue' || myBean.coins ne 'dime'", getELText(_structuredDocument,2851));
+        assertEquals("myBean.coins != myBean.colors", getELText(_structuredDocument,2934));
 
-        assertEquals("5 != true", getELText(_structuredDocument,3078));
-        assertEquals("5 ne true", getELText(_structuredDocument,3118));
-        assertEquals("myBean.integerProperty != myBean.booleanProperty", getELText(_structuredDocument,3158));
-        assertEquals("myBean.integerProperty ne myBean.booleanProperty", getELText(_structuredDocument,3237));
-        assertEquals("myBean.stringArrayProperty != myBean.booleanProperty", getELText(_structuredDocument,3316));
-        assertEquals("myBean.booleanProperty ne myBean.stringArrayProperty", getELText(_structuredDocument,3399));
-        assertEquals("myBean.integerProperty != true ", getELText(_structuredDocument,3485));
-        assertEquals("myBean.integerProperty ne true ", getELText(_structuredDocument,3550));
-        assertEquals("false != myBean.integerProperty", getELText(_structuredDocument,3615));
+        assertEquals("5 != true", getELText(_structuredDocument,3012));
+        assertEquals("5 ne true", getELText(_structuredDocument,3051));
+        assertEquals("myBean.integerProperty != myBean.booleanProperty", getELText(_structuredDocument,3090));
+        assertEquals("myBean.integerProperty ne myBean.booleanProperty", getELText(_structuredDocument,3168));
+        assertEquals("myBean.stringArrayProperty != myBean.booleanProperty", getELText(_structuredDocument,3246));
+        assertEquals("myBean.booleanProperty ne myBean.stringArrayProperty", getELText(_structuredDocument,3328));
+        assertEquals("myBean.integerProperty != true ", getELText(_structuredDocument,3413));
+        assertEquals("myBean.integerProperty ne true ", getELText(_structuredDocument,3477));
+        assertEquals("false != myBean.integerProperty", getELText(_structuredDocument,3541));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(914, Signature.SIG_BOOLEAN);
-        assertNoError(976, Signature.SIG_BOOLEAN);
-        assertNoError(1037, Signature.SIG_BOOLEAN);
-        assertNoError(1098, Signature.SIG_BOOLEAN);
-        assertNoError(1162, Signature.SIG_BOOLEAN);
-        assertNoError(1226, Signature.SIG_BOOLEAN);
-        assertNoError(1290, Signature.SIG_BOOLEAN);
-        assertNoError(1354, Signature.SIG_BOOLEAN);
-        assertNoError(1419, Signature.SIG_BOOLEAN);
-        assertNoError(1480, Signature.SIG_BOOLEAN);
-        assertNoError(1546, Signature.SIG_BOOLEAN);
-        assertNoError(1613, Signature.SIG_BOOLEAN);
-        assertNoError(1692, Signature.SIG_BOOLEAN);
-        assertNoError(1745, Signature.SIG_BOOLEAN);
-        assertNoError(1798, Signature.SIG_BOOLEAN);
-        assertNoError(1850, Signature.SIG_BOOLEAN);
-        assertNoError(1902, Signature.SIG_BOOLEAN);
-        assertNoError(1969, Signature.SIG_BOOLEAN);
-        assertNoError(2036, Signature.SIG_BOOLEAN);
-        assertNoError(2089, Signature.SIG_BOOLEAN);
+        assertNoError(828, Signature.SIG_BOOLEAN);
+        assertNoError(889, Signature.SIG_BOOLEAN);
+        assertNoError(950, Signature.SIG_BOOLEAN);
+        assertNoError(1010, Signature.SIG_BOOLEAN);
+        assertNoError(1070, Signature.SIG_BOOLEAN);
+        assertNoError(1133, Signature.SIG_BOOLEAN);
+        assertNoError(1196, Signature.SIG_BOOLEAN);
+        assertNoError(1259, Signature.SIG_BOOLEAN);
+        assertNoError(1322, Signature.SIG_BOOLEAN);
+        assertNoError(1386, Signature.SIG_BOOLEAN);
+        assertNoError(1446, Signature.SIG_BOOLEAN);
+        assertNoError(1511, Signature.SIG_BOOLEAN);
+        assertNoError(1577, Signature.SIG_BOOLEAN);
+        assertNoError(1655, Signature.SIG_BOOLEAN);
+        assertNoError(1707, Signature.SIG_BOOLEAN);
+        assertNoError(1759, Signature.SIG_BOOLEAN);
+        assertNoError(1810, Signature.SIG_BOOLEAN);
+        assertNoError(1861, Signature.SIG_BOOLEAN);
+        assertNoError(1927, Signature.SIG_BOOLEAN);
+        assertNoError(1993, Signature.SIG_BOOLEAN);
+        assertNoError(2045, Signature.SIG_BOOLEAN);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(2175, Signature.SIG_BOOLEAN, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(2212, Signature.SIG_BOOLEAN, 1);
+        List<IMessage> list = assertSemanticWarning(2128, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2249, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2164, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2293, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2200, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2337, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2243, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2379, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2286, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2421, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2327, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2464, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2368, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2507, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2410, Signature.SIG_BOOLEAN, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
+
+        list = assertSemanticWarning(2452, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2568, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2512, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2629, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2572, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2670, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2612, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2713, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2654, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
 
-        list = assertSemanticWarning(2771, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2711, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
 
-        list = assertSemanticWarning(2829, Signature.SIG_BOOLEAN, 2);
+        list = assertSemanticWarning(2768, Signature.SIG_BOOLEAN, 2);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(2913, Signature.SIG_BOOLEAN, 2);
+        list = assertSemanticWarning(2851, Signature.SIG_BOOLEAN, 2);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(2997, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2934, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(3078, null, 1);
+        List<IMessage> list = assertSemanticError(3012, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3118, null, 1);
+        list = assertSemanticError(3051, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3158, null, 1);
+        list = assertSemanticError(3090, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3237, null, 1);
+        list = assertSemanticError(3168, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3316, null, 1);
+        list = assertSemanticError(3246, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(3399, null, 1);
+        list = assertSemanticError(3328, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(3485, null, 1);
+        list = assertSemanticError(3413, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(3550, null, 1);
+        list = assertSemanticError(3477, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
-        
-        list = assertSemanticError(3615, null, 1);
+
+        list = assertSemanticError(3541, null, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalNotTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalNotTestCase.java
index 1c9903b..0df3540 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalNotTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalNotTestCase.java
@@ -15,109 +15,114 @@
  */
 public class LogicalNotTestCase extends SingleJSPTestCase {
 
-    public LogicalNotTestCase() 
+    public LogicalNotTestCase()
     {
         super("/testdata/jsps/logicalNOT.jsp.data", "/logicalNOT.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("!myBean.booleanProperty", getELText(_structuredDocument,853));
-        assertEquals("not myBean.booleanProperty", getELText(_structuredDocument,910));
-        assertEquals("!myBean.stringProperty", getELText(_structuredDocument,967));
-        assertEquals("not myBean.stringProperty", getELText(_structuredDocument,1020));
+        assertEquals("!myBean.booleanProperty", getELText(_structuredDocument,829));
+        assertEquals("not myBean.booleanProperty", getELText(_structuredDocument,885));
+        assertEquals("!myBean.stringProperty", getELText(_structuredDocument,941));
+        assertEquals("not myBean.stringProperty", getELText(_structuredDocument,993));
 
-        assertEquals("!true", getELText(_structuredDocument,1105));
-        assertEquals("not true", getELText(_structuredDocument,1144));
-        assertEquals("!false", getELText(_structuredDocument,1186));
-        assertEquals("not false", getELText(_structuredDocument,1226));
-        assertEquals("! 'true'", getELText(_structuredDocument,1269));
-        assertEquals("not 'true'", getELText(_structuredDocument,1311));
-        assertEquals("! 'notTrue'", getELText(_structuredDocument,1355));
-        assertEquals("not 'notTrue'", getELText(_structuredDocument,1400));
+        assertEquals("!true", getELText(_structuredDocument,1075));
+        assertEquals("not true", getELText(_structuredDocument,1113));
+        assertEquals("!false", getELText(_structuredDocument,1154));
+        assertEquals("not false", getELText(_structuredDocument,1193));
+        assertEquals("! 'true'", getELText(_structuredDocument,1235));
+        assertEquals("not 'true'", getELText(_structuredDocument,1276));
+        assertEquals("! 'notTrue'", getELText(_structuredDocument,1319));
+        assertEquals("not 'notTrue'", getELText(_structuredDocument,1363));
 
-        assertEquals("!5", getELText(_structuredDocument,1470));
-        assertEquals("not 5", getELText(_structuredDocument,1503));
-        assertEquals("!myBean.integerProperty", getELText(_structuredDocument,1539));
-        assertEquals("not myBean.integerProperty", getELText(_structuredDocument,1593));
-        assertEquals("!myBean.collectionProperty", getELText(_structuredDocument,1650));
-        assertEquals("not myBean.collectionProperty", getELText(_structuredDocument,1707));
-        assertEquals("!myBean.stringArrayProperty", getELText(_structuredDocument,1767));
-        assertEquals("not myBean.stringArrayProperty", getELText(_structuredDocument,1825));
-        assertEquals("!myBean.mapProperty", getELText(_structuredDocument,1886));
-        assertEquals("not myBean.mapProperty", getELText(_structuredDocument,1936));
+        assertEquals("!5", getELText(_structuredDocument,1430));
+        assertEquals("not 5", getELText(_structuredDocument,1462));
+        assertEquals("!myBean.integerProperty", getELText(_structuredDocument,1497));
+        assertEquals("not myBean.integerProperty", getELText(_structuredDocument,1550));
+        assertEquals("!myBean.collectionProperty", getELText(_structuredDocument,1606));
+        assertEquals("not myBean.collectionProperty", getELText(_structuredDocument,1662));
+        assertEquals("!myBean.stringArrayProperty", getELText(_structuredDocument,1721));
+        assertEquals("not myBean.stringArrayProperty", getELText(_structuredDocument,1778));
+        assertEquals("!myBean.mapProperty", getELText(_structuredDocument,1838));
+        assertEquals("not myBean.mapProperty", getELText(_structuredDocument,1887));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(853, Signature.SIG_BOOLEAN);
-        assertNoError(910, Signature.SIG_BOOLEAN);
-        assertNoError(967, Signature.SIG_BOOLEAN);
-        assertNoError(1020, Signature.SIG_BOOLEAN);
+        assertNoError(829, Signature.SIG_BOOLEAN);
+        assertNoError(885, Signature.SIG_BOOLEAN);
+        assertNoError(941, Signature.SIG_BOOLEAN);
+        assertNoError(993, Signature.SIG_BOOLEAN);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1105, Signature.SIG_BOOLEAN, 1);
+        List<IMessage> list = assertSemanticWarning(1075, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1144, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1113, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1186, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1154, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1226, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1193, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1269, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1235, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1311, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1276, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1355, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1319, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1400, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1363, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(1470, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
-        
-        list = assertSemanticError(1503, null, 1);
+        List<IMessage> list = assertSemanticError(1430, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(1539, null, 1);
+        list = assertSemanticError(1462, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(1593, null, 1);
+        list = assertSemanticError(1497, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(1650, null, 1);
+        list = assertSemanticError(1550, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(1707, null, 1);
+        list = assertSemanticError(1606, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(1767, null, 1);
+        list = assertSemanticError(1662, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(1825, null, 1);
+        list = assertSemanticError(1721, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(1886, null, 1);
+        list = assertSemanticError(1778, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        list = assertSemanticError(1936, null, 1);
+        list = assertSemanticError(1838, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
+
+        list = assertSemanticError(1887, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
     }
 
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalOrTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalOrTestCase.java
index e05c057..cdb892e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalOrTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/LogicalOrTestCase.java
@@ -13,97 +13,102 @@
  *
  * @author cbateman
  */
-public class LogicalOrTestCase extends SingleJSPTestCase 
+public class LogicalOrTestCase extends SingleJSPTestCase
 {
     public LogicalOrTestCase()
     {
         super("/testdata/jsps/logicalOR.jsp.data", "/logicalOR.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("myBean.booleanProperty or myBean.booleanProperty", getELText(_structuredDocument,852));
-        assertEquals("myBean.booleanProperty || myBean.booleanProperty", getELText(_structuredDocument,934));
-        assertEquals("false || myBean.booleanProperty", getELText(_structuredDocument,1016));
-        assertEquals("false or myBean.booleanProperty", getELText(_structuredDocument,1081));
-        assertEquals("null || myBean.booleanProperty ", getELText(_structuredDocument,1146));
-        assertEquals("null or myBean.booleanProperty ", getELText(_structuredDocument,1211));
-        assertEquals("'notTrue' || myBean.booleanProperty", getELText(_structuredDocument,1276));
-        assertEquals("myBean.booleanProperty || false", getELText(_structuredDocument,1352));
-        assertEquals("myBean.booleanProperty or false", getELText(_structuredDocument,1417));
-        assertEquals("myBean.booleanProperty || null ", getELText(_structuredDocument,1482));
-        assertEquals("myBean.booleanProperty or null", getELText(_structuredDocument,1547));
-        assertEquals("myBean.booleanProperty || 'notTrue'", getELText(_structuredDocument,1611));
-        assertEquals("myBean.booleanProperty or 'notTrue'", getELText(_structuredDocument,1682));
+        assertEquals("myBean.booleanProperty or myBean.booleanProperty", getELText(_structuredDocument,828));
+        assertEquals("myBean.booleanProperty || myBean.booleanProperty", getELText(_structuredDocument,909));
+        assertEquals("false || myBean.booleanProperty", getELText(_structuredDocument,990));
+        assertEquals("false or myBean.booleanProperty", getELText(_structuredDocument,1054));
+        assertEquals("null || myBean.booleanProperty ", getELText(_structuredDocument,1118));
+        assertEquals("null or myBean.booleanProperty ", getELText(_structuredDocument,1182));
+        assertEquals("'notTrue' || myBean.booleanProperty", getELText(_structuredDocument,1246));
+        assertEquals("myBean.booleanProperty || false", getELText(_structuredDocument,1321));
+        assertEquals("myBean.booleanProperty or false", getELText(_structuredDocument,1385));
+        assertEquals("myBean.booleanProperty || null ", getELText(_structuredDocument,1449));
+        assertEquals("myBean.booleanProperty or null", getELText(_structuredDocument,1513));
+        assertEquals("myBean.booleanProperty || 'notTrue'", getELText(_structuredDocument,1576));
+        assertEquals("myBean.booleanProperty or 'notTrue'", getELText(_structuredDocument,1646));
 
-        assertEquals("'true' or myBean.booleanProperty", getELText(_structuredDocument,1777));
-        assertEquals("'true' || myBean.booleanProperty", getELText(_structuredDocument,1844));
-        assertEquals("myBean.booleanProperty or true ", getELText(_structuredDocument,1908));
-        assertEquals("myBean.booleanProperty || true ", getELText(_structuredDocument,1970));
-        assertEquals("myBean.booleanProperty || 'true'", getELText(_structuredDocument,2032));
-        assertEquals("false || true", getELText(_structuredDocument,2095));
-        assertEquals("null || true", getELText(_structuredDocument,2139));
+        assertEquals("'true' or myBean.booleanProperty", getELText(_structuredDocument,1738));
+        assertEquals("'true' || myBean.booleanProperty", getELText(_structuredDocument,1804));
+        assertEquals("myBean.booleanProperty or true ", getELText(_structuredDocument,1867));
+        assertEquals("myBean.booleanProperty || true ", getELText(_structuredDocument,1928));
+        assertEquals("myBean.booleanProperty || 'true'", getELText(_structuredDocument,1989));
+        assertEquals("false || true", getELText(_structuredDocument,2051));
+        assertEquals("null || true", getELText(_structuredDocument,2094));
 
-        assertEquals("myBean.integerProperty || false", getELText(_structuredDocument,2209));
-        assertEquals("false || myBean.integerProperty", getELText(_structuredDocument,2274));
-        assertEquals("4 || false", getELText(_structuredDocument,2339));
+        assertEquals("myBean.integerProperty || false", getELText(_structuredDocument,2161));
+        assertEquals("false || myBean.integerProperty", getELText(_structuredDocument,2225));
+        assertEquals("4 || false", getELText(_structuredDocument,2289));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(934, Signature.SIG_BOOLEAN);
-        assertNoError(1016, Signature.SIG_BOOLEAN);
-        assertNoError(1081, Signature.SIG_BOOLEAN);
-        assertNoError(1146, Signature.SIG_BOOLEAN);
-        assertNoError(1211, Signature.SIG_BOOLEAN);
-        assertNoError(1276, Signature.SIG_BOOLEAN);
-        assertNoError(1352, Signature.SIG_BOOLEAN);
-        assertNoError(1417, Signature.SIG_BOOLEAN);
-        assertNoError(1482, Signature.SIG_BOOLEAN);
-        assertNoError(1547, Signature.SIG_BOOLEAN);
-        assertNoError(1611, Signature.SIG_BOOLEAN);
-        assertNoError(1682, Signature.SIG_BOOLEAN);
+        assertNoError(828, Signature.SIG_BOOLEAN);
+        assertNoError(909, Signature.SIG_BOOLEAN);
+        assertNoError(990, Signature.SIG_BOOLEAN);
+        assertNoError(1054, Signature.SIG_BOOLEAN);
+        assertNoError(1118, Signature.SIG_BOOLEAN);
+        assertNoError(1182, Signature.SIG_BOOLEAN);
+        assertNoError(1246, Signature.SIG_BOOLEAN);
+        assertNoError(1321, Signature.SIG_BOOLEAN);
+        assertNoError(1385, Signature.SIG_BOOLEAN);
+        assertNoError(1449, Signature.SIG_BOOLEAN);
+        assertNoError(1513, Signature.SIG_BOOLEAN);
+        assertNoError(1576, Signature.SIG_BOOLEAN);
+        assertNoError(1646, Signature.SIG_BOOLEAN);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1777, Signature.SIG_BOOLEAN, 1);
+        List<IMessage> list = assertSemanticWarning(1738, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(1844, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1804, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID);
 
-        list = assertSemanticWarning(1908, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1867, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1970, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1928, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2032, Signature.SIG_BOOLEAN, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
-        
-        list = assertSemanticWarning(2095, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1989, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(2139, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(2051, Signature.SIG_BOOLEAN, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
+
+        list = assertSemanticWarning(2094, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(2209, null,1);
+        final List<IMessage> list = assertSemanticError(2161, null,1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        assertSemanticError(2274, null,1);
+        assertSemanticError(2225, null,1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
 
-        assertSemanticError(2339, null,1);
+        assertSemanticError(2289, null,1);
         assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID);
     }
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/MarkerOffsetsTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/MarkerOffsetsTestCase.java
index 0fc213a..c52a2f9 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/MarkerOffsetsTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/MarkerOffsetsTestCase.java
@@ -17,129 +17,145 @@
  * @author cbateman
  *
  */
-public class MarkerOffsetsTestCase extends SingleJSPTestCase 
+public class MarkerOffsetsTestCase extends SingleJSPTestCase
 {
     public MarkerOffsetsTestCase() {
         super("/testdata/jsps/markerOffsets.jsp.data", "/markerOffsets.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("5 + 3", getELText(_structuredDocument,905));
-        assertEquals("null / null", getELText(_structuredDocument,941));
-        assertEquals("myBean.integerProperty == null", getELText(_structuredDocument,983));
-        assertEquals("false && myBean.booleanProperty", getELText(_structuredDocument,1043));
-        assertEquals("myBean.booleanProperty && false", getELText(_structuredDocument,1104));
-        assertEquals("!false", getELText(_structuredDocument,1165));
-        assertEquals("empty 5", getELText(_structuredDocument,1202));
-        assertEquals("-null", getELText(_structuredDocument,1240));
-        assertEquals("-myBean.stringProperty", getELText(_structuredDocument,1276));
-        assertEquals("myBean.integerProperty - (5 + 3)", getELText(_structuredDocument,1412));
-        assertEquals("myBean.booleanProperty && myBean.integerProperty + 5 == null", getELText(_structuredDocument,1475));
-        assertEquals("notABean.stringProperty", getELText(_structuredDocument,1609));
-        assertEquals("myBean.notAProperty", getELText(_structuredDocument,1663));
-        assertEquals("myBean.integerProperty + 5 + myBean.notAProperty", getELText(_structuredDocument,1713));
-        assertEquals("myBean.integerProperty++", getELText(_structuredDocument,1814));
-        assertEquals("myBean.", getELText(_structuredDocument,1869));
-        assertEquals(" ", getELText(_structuredDocument,1907));
-        
-        assertEquals("myBean.integerProperty / 0", getELText(_structuredDocument,2028));
-        assertEquals("myBean.integerProperty + myBean.booleanProperty", getELText(_structuredDocument,2085));
-        assertEquals("myBean.integerProperty && myBean.booleanProperty", getELText(_structuredDocument,2163));
-        assertEquals("myBean.booleanProperty >= myBean.collectionProperty", getELText(_structuredDocument,2242));
-        assertEquals("5 + 'noNumberConversion'", getELText(_structuredDocument,2324));
-        assertEquals("-true", getELText(_structuredDocument,2379));
-        assertEquals("!5", getELText(_structuredDocument,2415));
-        assertEquals("myBean.doubleProperty + myBean.getIntegerProperty", getELText(_structuredDocument,2477));
+        assertEquals("5 + 3", getELText(_structuredDocument,880));
+        assertEquals("null / null", getELText(_structuredDocument,915));
+        assertEquals("myBean.integerProperty == null", getELText(_structuredDocument,956));
+        assertEquals("false && myBean.booleanProperty", getELText(_structuredDocument,1015));
+        assertEquals("myBean.booleanProperty && false", getELText(_structuredDocument,1075));
+        assertEquals("!false", getELText(_structuredDocument,1135));
+        assertEquals("empty 5", getELText(_structuredDocument,1171));
+        assertEquals("-null", getELText(_structuredDocument,1208));
+        assertEquals("-myBean.stringProperty", getELText(_structuredDocument,1243));
+        assertEquals("myBean.integerProperty - (5 + 3)", getELText(_structuredDocument,1376));
+        assertEquals("myBean.booleanProperty && myBean.integerProperty + 5 == null", getELText(_structuredDocument,1438));
+        assertEquals("notABean.stringProperty", getELText(_structuredDocument,1569));
+        assertEquals("myBean.notAProperty", getELText(_structuredDocument,1622));
+        assertEquals("myBean.integerProperty + 5 + myBean.notAProperty", getELText(_structuredDocument,1671));
+        assertEquals("myBean.integerProperty++", getELText(_structuredDocument,1769));
+        assertEquals("myBean.", getELText(_structuredDocument,1823));
+        assertEquals(" ", getELText(_structuredDocument,1860));
+
+        assertEquals("myBean.integerProperty / 0", getELText(_structuredDocument,1978));
+        assertEquals("myBean.integerProperty + myBean.booleanProperty", getELText(_structuredDocument,2034));
+        assertEquals("myBean.integerProperty && myBean.booleanProperty", getELText(_structuredDocument,2111));
+        assertEquals("myBean.booleanProperty >= myBean.collectionProperty", getELText(_structuredDocument,2189));
+        assertEquals("5 + 'noNumberConversion'", getELText(_structuredDocument,2270));
+        assertEquals("-true", getELText(_structuredDocument,2324));
+        assertEquals("!5", getELText(_structuredDocument,2359));
+        assertEquals("myBean.doubleProperty + myBean.getIntegerProperty", getELText(_structuredDocument,2418));
+
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
         // marker offset tests are only meaningful for validation warnings and errors
         // since we are testing the length and offset values for their corresponding markers
     }
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(905, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID, 905, 5);
+        // UPDATE REMINDER!  The third argument in assertContainsProblem is the start
+        // offset (absolute) of the marker expected.  Before updating the assertSemanticWarning
+        // make a note to the difference
+        List<IMessage> list = assertSemanticWarning(880, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID, 880, 5);
 
-        list = assertSemanticWarning(941, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID, 941, 11);
-        
-        list = assertSemanticWarning(983, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID, 983, 30);
+        list = assertSemanticWarning(915, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_BOTH_OPERANDS_NULL_ID, 915, 11);
 
-        list = assertSemanticWarning(1043, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID, 1043, 31);
+        list = assertSemanticWarning(956, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID, 956, 30);
 
-        list = assertSemanticWarning(1104, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID, 1104, 31);
+        list = assertSemanticWarning(1015, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS_ID, 1015, 31);
 
-        list = assertSemanticWarning(1165, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID, 1165, 6);
+        list = assertSemanticWarning(1075, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID, 1075, 31);
 
-        list = assertSemanticWarning(1202, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE_ID, 1202, 7);
+        list = assertSemanticWarning(1135, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID, 1135, 6);
 
-        list = assertSemanticWarning(1240, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_MINUS_ON_NULL_ALWAYS_ZERO_ID, 1240, 5);
+        list = assertSemanticWarning(1171, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE_ID, 1171, 7);
 
-        list = assertSemanticWarning(1412, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID, 1438, 5);
+        list = assertSemanticWarning(1208, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_MINUS_ON_NULL_ALWAYS_ZERO_ID, 1208, 5);
 
-        list = assertSemanticWarning(1475, null, 2);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID, 1501, 34);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID, 1475, 60);
+        list = assertSemanticWarning(1243, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED_ID, 1243, 22);
 
-        list = assertSemanticWarning(1609, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.VARIABLE_NOT_FOUND_ID, 1609, 8);
+        list = assertSemanticWarning(1376, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME_ID, 1402, 5);
 
-        list = assertSemanticWarning(1663, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID, 1670, 12);
+        list = assertSemanticWarning(1438, null, 2);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME_ID, 1464, 34);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME_ID, 1438, 60);
 
-        list = assertSemanticWarning(1713, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID, 1749, 12);
+        list = assertSemanticWarning(1569, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.VARIABLE_NOT_FOUND_ID, 1569, 8);
 
-        list = assertSyntaxWarning(1814, 1);
-        assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID, 1837, 1);
+        list = assertSemanticWarning(1622, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID, 1629, 12);
 
-        list = assertSemanticWarning(1869, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID, 1875, 1);
+        list = assertSemanticWarning(1671, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID, 1707, 12);
 
-        list = assertSyntaxWarning(1907, 1);
-        assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID, 1907, 1);
+        list = assertSyntaxWarning(1769, 1);
+        assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID, 1792, 1);
+
+        // Is really correct to have the property offset start on the dot?
+        list = assertSemanticWarning(1823, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.MEMBER_NOT_FOUND_ID, 1829, 1);
+
+        list = assertSyntaxWarning(1860, 1);
+        assertContainsProblem(list, DiagnosticFactory.GENERAL_SYNTAX_ERROR_ID, 1860, 1);
     }
-    
-    public void testErrorExprs() 
+
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(2028, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID, 2028, 26);
+        // UPDATE REMINDER!  The third argument in assertContainsProblem is the start
+        // offset (absolute) of the marker expected.  Before updating the assertSemanticWarning
+        // make a note to the difference
+        List<IMessage> list = assertSemanticError(1978, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_POSSIBLE_DIVISION_BY_ZERO_ID, 1978, 26);
 
-        list = assertSemanticError(2085, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID, 2085, 47);
+        list = assertSemanticError(2034, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID, 2034, 47);
 
-        list = assertSemanticError(2163, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID, 2163, 48);
+        list = assertSemanticError(2111, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID, 2111, 48);
 
-        list = assertSemanticError(2242, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID, 2242, 51);
+        list = assertSemanticError(2189, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_NO_AVAILABLE_TYPE_COERCION_ID, 2189, 51);
+
+        list = assertSemanticError(2270, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_COERCE_LITERALS_TO_NUMBERS_ID, 2270, 24);
 
         list = assertSemanticError(2324, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.BINARY_OP_COULD_NOT_COERCE_LITERALS_TO_NUMBERS_ID, 2324, 24);
+        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID, 2324, 5);
 
-        list = assertSemanticError(2379, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID, 2379, 5);
+        list = assertSemanticError(2359, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID, 2359, 2);
 
-        list = assertSemanticError(2415, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN_ID, 2415, 2);
-
-        list = assertSemanticError(2477, null, 1);
-        assertContainsProblem(list, DiagnosticFactory.CANNOT_APPLY_OPERATOR_TO_METHOD_BINDING_ID, 2501, 25);
+        list = assertSemanticError(2418, null, 1);
+        assertContainsProblem(list, DiagnosticFactory.CANNOT_APPLY_OPERATOR_TO_METHOD_BINDING_ID, 2442, 25);
     }
 
 }
\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/MethodBindingTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/MethodBindingTestCase.java
index d3aac9d..6f6d9fd 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/MethodBindingTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/MethodBindingTestCase.java
@@ -14,115 +14,120 @@
  * 
  * @author cbateman
  */
-public class MethodBindingTestCase extends SingleJSPTestCase 
+public class MethodBindingTestCase extends SingleJSPTestCase
 {
-    public MethodBindingTestCase() 
+    public MethodBindingTestCase()
     {
         super("/testdata/jsps/methodBinding.jsp.data", "/methodBinding.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("myBean.getStringProperty", getELText(_structuredDocument,849));
-        assertEquals("myBean.getIntegerProperty", getELText(_structuredDocument,910));
-        assertEquals("myBean.getBooleanProperty", getELText(_structuredDocument,972));
-        assertEquals("myBean.getDoubleProperty", getELText(_structuredDocument,1034));
-        assertEquals("myBean.getMapProperty", getELText(_structuredDocument,1095));
-        assertEquals("myBean.getStringArrayProperty", getELText(_structuredDocument,1153));
-        assertEquals("myBean.getCollectionProperty", getELText(_structuredDocument,1219));
-        assertEquals("myBean.getListProperty", getELText(_structuredDocument,1284));
-        assertEquals("myBean.getComparableProperty", getELText(_structuredDocument,1343));
-        assertEquals("myBean.getBigIntegerProperty", getELText(_structuredDocument,1408));
-        assertEquals("myBean.getBigDoubleProperty", getELText(_structuredDocument,1473));
-        assertEquals("myBean.recursiveCall", getELText(_structuredDocument,1537));
-        assertEquals("myBean.getWritableStringProperty", getELText(_structuredDocument,1594));
-        assertEquals("myBean.setWritableStringProperty", getELText(_structuredDocument,1663));
-        assertEquals("myBean.validate", getELText(_structuredDocument,1732));
-        assertEquals("myBean.validate2", getELText(_structuredDocument,1784));
-        assertEquals("myBean.getSelf", getELText(_structuredDocument,1837));
-        assertEquals("myBean.isIsStyleBooleanProperty", getELText(_structuredDocument,1888));
-        assertEquals("myBeanSubClass.getStringProperty", getELText(_structuredDocument,1958));
-        assertEquals("myBeanSubClass.getIntegerProperty", getELText(_structuredDocument,2027));
-        assertEquals("myBeanSubClass.getBooleanProperty", getELText(_structuredDocument,2097));
-        assertEquals("myBeanSubClass.getDoubleProperty", getELText(_structuredDocument,2167));
-        assertEquals("myBeanSubClass.getMapProperty", getELText(_structuredDocument,2236));
-        assertEquals("myBeanSubClass.getStringArrayProperty", getELText(_structuredDocument,2302));
-        assertEquals("myBeanSubClass.getCollectionProperty", getELText(_structuredDocument,2376));
-        assertEquals("myBeanSubClass.getListProperty", getELText(_structuredDocument,2449));
-        assertEquals("myBeanSubClass.getComparableProperty", getELText(_structuredDocument,2516));
-        assertEquals("myBeanSubClass.getBigIntegerProperty", getELText(_structuredDocument,2589));
-        assertEquals("myBeanSubClass.getBigDoubleProperty", getELText(_structuredDocument,2662));
-        assertEquals("myBeanSubClass.recursiveCall", getELText(_structuredDocument,2734));
-        assertEquals("myBeanSubClass.getWritableStringProperty", getELText(_structuredDocument,2799));
-        assertEquals("myBeanSubClass.setWritableStringProperty", getELText(_structuredDocument,2876));
-        assertEquals("myBeanSubClass.validate", getELText(_structuredDocument,2953));
-        assertEquals("myBeanSubClass.validate2", getELText(_structuredDocument,3013));
-        assertEquals("myBeanSubClass.getSelf", getELText(_structuredDocument,3074));
-        assertEquals("myBeanSubClass.isIsStyleBooleanProperty", getELText(_structuredDocument,3133));
-        assertEquals("myBeanSubClass.getSubClassStringProperty", getELText(_structuredDocument,3209));
+        assertEquals("myBean.getStringProperty", getELText(_structuredDocument,825));
+        assertEquals("myBean.getIntegerProperty", getELText(_structuredDocument,885));
+        assertEquals("myBean.getBooleanProperty", getELText(_structuredDocument,946));
+        assertEquals("myBean.getDoubleProperty", getELText(_structuredDocument,1007));
+        assertEquals("myBean.getMapProperty", getELText(_structuredDocument,1067));
+        assertEquals("myBean.getStringArrayProperty", getELText(_structuredDocument,1124));
+        assertEquals("myBean.getCollectionProperty", getELText(_structuredDocument,1189));
+        assertEquals("myBean.getListProperty", getELText(_structuredDocument,1253));
+        assertEquals("myBean.getComparableProperty", getELText(_structuredDocument,1311));
+        assertEquals("myBean.getBigIntegerProperty", getELText(_structuredDocument,1375));
+        assertEquals("myBean.getBigDoubleProperty", getELText(_structuredDocument,1439));
+        assertEquals("myBean.recursiveCall", getELText(_structuredDocument,1502));
+        assertEquals("myBean.getWritableStringProperty", getELText(_structuredDocument,1558));
+        assertEquals("myBean.setWritableStringProperty", getELText(_structuredDocument,1626));
+        assertEquals("myBean.validate", getELText(_structuredDocument,1694));
+        assertEquals("myBean.validate2", getELText(_structuredDocument,1745));
+        assertEquals("myBean.getSelf", getELText(_structuredDocument,1797));
+        assertEquals("myBean.isIsStyleBooleanProperty", getELText(_structuredDocument,1847));
+        assertEquals("myBeanSubClass.getStringProperty", getELText(_structuredDocument,1915));
+        assertEquals("myBeanSubClass.getIntegerProperty", getELText(_structuredDocument,1983));
+        assertEquals("myBeanSubClass.getBooleanProperty", getELText(_structuredDocument,2052));
+        assertEquals("myBeanSubClass.getDoubleProperty", getELText(_structuredDocument,2121));
+        assertEquals("myBeanSubClass.getMapProperty", getELText(_structuredDocument,2189));
+        assertEquals("myBeanSubClass.getStringArrayProperty", getELText(_structuredDocument,2254));
+        assertEquals("myBeanSubClass.getCollectionProperty", getELText(_structuredDocument,2327));
+        assertEquals("myBeanSubClass.getListProperty", getELText(_structuredDocument,2399));
+        assertEquals("myBeanSubClass.getComparableProperty", getELText(_structuredDocument,2465));
+        assertEquals("myBeanSubClass.getBigIntegerProperty", getELText(_structuredDocument,2537));
+        assertEquals("myBeanSubClass.getBigDoubleProperty", getELText(_structuredDocument,2609));
+        assertEquals("myBeanSubClass.recursiveCall", getELText(_structuredDocument,2680));
+        assertEquals("myBeanSubClass.getWritableStringProperty", getELText(_structuredDocument,2744));
+        assertEquals("myBeanSubClass.setWritableStringProperty", getELText(_structuredDocument,2820));
+        assertEquals("myBeanSubClass.validate", getELText(_structuredDocument,2896));
+        assertEquals("myBeanSubClass.validate2", getELText(_structuredDocument,2955));
+        assertEquals("myBeanSubClass.getSelf", getELText(_structuredDocument,3015));
+        assertEquals("myBeanSubClass.isIsStyleBooleanProperty", getELText(_structuredDocument,3073));
+        assertEquals("myBeanSubClass.getSubClassStringProperty", getELText(_structuredDocument,3148));
 
-        assertEquals("-myBean.validate", getELText(_structuredDocument,3338));
-        assertEquals("myBean.getIntegerProperty + myBean.getDoubleProperty", getELText(_structuredDocument,3387));
+        assertEquals("-myBean.validate", getELText(_structuredDocument,3272));
+        assertEquals("myBean.getIntegerProperty + myBean.getDoubleProperty", getELText(_structuredDocument,3320));
     }
- 
+
+    @Override
     public void testNoErrorExprs() {
         final String[] noStrings = new  String[0];
-        assertNoError(849, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
-        assertNoError(910, Signature.createMethodSignature(noStrings, Signature.SIG_INT));
-        assertNoError(972, Signature.createMethodSignature(noStrings, Signature.SIG_BOOLEAN));
-        assertNoError(1034, Signature.createMethodSignature(noStrings, Signature.SIG_DOUBLE));
-        assertNoError(1095, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_MAP));
-        assertNoError(1153, Signature.createMethodSignature(noStrings, Signature.createArraySignature(TypeConstants.TYPE_STRING,1)));
-        assertNoError(1219, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_COLLECTION));
-        assertNoError(1284, Signature.createMethodSignature(noStrings, "Ljava.util.List;"));
-        assertNoError(1343, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_COMPARABLE));
-        assertNoError(1408, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_BIG_INTEGER));
-        assertNoError(1473, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_BIG_DOUBLE));
-        assertNoError(1537, Signature.createMethodSignature(noStrings, "Lbeans.MyBean;"));
-        assertNoError(1594, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
-        assertNoError(1663, Signature.createMethodSignature(new String[]{TypeConstants.TYPE_STRING}, Signature.SIG_VOID));
-        assertNoError(1732, "(QFacesContext;QUIComponent;Ljava.lang.Object;)V");
-        assertNoError(1784, "(QFacesContext;QUIComponent;[Ljava.lang.Object;)V");
-        assertNoError(1837, Signature.createMethodSignature(noStrings, "Lbeans.MyBean;"));        
-        assertNoError(1888, Signature.createMethodSignature(noStrings, Signature.SIG_BOOLEAN));        
+        assertNoError(825, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
+        assertNoError(885, Signature.createMethodSignature(noStrings, Signature.SIG_INT));
+        assertNoError(946, Signature.createMethodSignature(noStrings, Signature.SIG_BOOLEAN));
+        assertNoError(1007, Signature.createMethodSignature(noStrings, Signature.SIG_DOUBLE));
+        assertNoError(1067, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_MAP));
+        assertNoError(1124, Signature.createMethodSignature(noStrings, Signature.createArraySignature(TypeConstants.TYPE_STRING,1)));
+        assertNoError(1189, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_COLLECTION));
+        assertNoError(1253, Signature.createMethodSignature(noStrings, "Ljava.util.List;"));
+        assertNoError(1311, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_COMPARABLE));
+        assertNoError(1375, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_BIG_INTEGER));
+        assertNoError(1439, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_BIG_DOUBLE));
+        assertNoError(1502, Signature.createMethodSignature(noStrings, "Lbeans.MyBean;"));
+        assertNoError(1558, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
+        assertNoError(1626, Signature.createMethodSignature(new String[]{TypeConstants.TYPE_STRING}, Signature.SIG_VOID));
+        assertNoError(1694, "(QFacesContext;QUIComponent;Ljava.lang.Object;)V");
+        assertNoError(1745, "(QFacesContext;QUIComponent;[Ljava.lang.Object;)V");
+        assertNoError(1797, Signature.createMethodSignature(noStrings, "Lbeans.MyBean;"));
+        assertNoError(1847, Signature.createMethodSignature(noStrings, Signature.SIG_BOOLEAN));
 
-        assertNoError(1958, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
-        assertNoError(2027, Signature.createMethodSignature(noStrings, Signature.SIG_INT));
-        assertNoError(2097, Signature.createMethodSignature(noStrings, Signature.SIG_BOOLEAN));
-        assertNoError(2167, Signature.createMethodSignature(noStrings, Signature.SIG_DOUBLE));
-        assertNoError(2236, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_MAP));
-        assertNoError(2302, Signature.createMethodSignature(noStrings, Signature.createArraySignature(TypeConstants.TYPE_STRING,1)));
-        assertNoError(2376, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_COLLECTION));
-        assertNoError(2449, Signature.createMethodSignature(noStrings, "Ljava.util.List;"));
-        assertNoError(2516, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_COMPARABLE));
-        assertNoError(2589, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_BIG_INTEGER));
-        assertNoError(2662, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_BIG_DOUBLE));
-        assertNoError(2734, Signature.createMethodSignature(noStrings, "Lbeans.MyBean;"));
-        assertNoError(2799, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
-        assertNoError(2876, Signature.createMethodSignature(new String[]{TypeConstants.TYPE_STRING}, Signature.SIG_VOID));
-        assertNoError(2953, "(QFacesContext;QUIComponent;Ljava.lang.Object;)V");
-        assertNoError(3013, "(QFacesContext;QUIComponent;[Ljava.lang.Object;)V");
-        assertNoError(3074, Signature.createMethodSignature(noStrings, "Lbeans.MyBean;"));        
-        assertNoError(3133, Signature.createMethodSignature(noStrings, Signature.SIG_BOOLEAN));        
-        assertNoError(3209, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));        
+        assertNoError(1915, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
+        assertNoError(1983, Signature.createMethodSignature(noStrings, Signature.SIG_INT));
+        assertNoError(2052, Signature.createMethodSignature(noStrings, Signature.SIG_BOOLEAN));
+        assertNoError(2121, Signature.createMethodSignature(noStrings, Signature.SIG_DOUBLE));
+        assertNoError(2189, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_MAP));
+        assertNoError(2254, Signature.createMethodSignature(noStrings, Signature.createArraySignature(TypeConstants.TYPE_STRING,1)));
+        assertNoError(2327, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_COLLECTION));
+        assertNoError(2399, Signature.createMethodSignature(noStrings, "Ljava.util.List;"));
+        assertNoError(2465, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_COMPARABLE));
+        assertNoError(2537, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_BIG_INTEGER));
+        assertNoError(2609, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_BIG_DOUBLE));
+        assertNoError(2680, Signature.createMethodSignature(noStrings, "Lbeans.MyBean;"));
+        assertNoError(2744, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
+        assertNoError(2820, Signature.createMethodSignature(new String[]{TypeConstants.TYPE_STRING}, Signature.SIG_VOID));
+        assertNoError(2896, "(QFacesContext;QUIComponent;Ljava.lang.Object;)V");
+        assertNoError(2955, "(QFacesContext;QUIComponent;[Ljava.lang.Object;)V");
+        assertNoError(3015, Signature.createMethodSignature(noStrings, "Lbeans.MyBean;"));
+        assertNoError(3073, Signature.createMethodSignature(noStrings, Signature.SIG_BOOLEAN));
+        assertNoError(3148, Signature.createMethodSignature(noStrings, TypeConstants.TYPE_STRING));
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
         // no warning cases
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(3338, null, 1);
+        List<IMessage> list = assertSemanticError(3272, null, 1);
         assertContainsProblem(list, DiagnosticFactory.CANNOT_APPLY_OPERATOR_TO_METHOD_BINDING_ID);
 
-        list = assertSemanticError(3387, null, 2);
+        list = assertSemanticError(3320, null, 2);
         assertContainsProblem(list, DiagnosticFactory.CANNOT_APPLY_OPERATOR_TO_METHOD_BINDING_ID);
     }
 
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/PropertiesOfListTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/PropertiesOfListTestCase.java
index 0a8a4f4..267ad49 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/PropertiesOfListTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/PropertiesOfListTestCase.java
@@ -3,13 +3,14 @@
 import org.eclipse.jst.jsf.core.JSFVersion;
 import org.eclipse.jst.jsf.validation.el.tests.base.SingleJSPTestCase;
 
-public class PropertiesOfListTestCase extends SingleJSPTestCase 
+public class PropertiesOfListTestCase extends SingleJSPTestCase
 {
     public PropertiesOfListTestCase()
     {
         super("/testdata/jsps/propertiesOfMaps.jsp.data", "/propertiesOfMaps.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/PropertiesOfMapsTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/PropertiesOfMapsTestCase.java
index 4672ee1..da91826 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/PropertiesOfMapsTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/PropertiesOfMapsTestCase.java
@@ -13,55 +13,61 @@
  * @author cbateman
  *
  */
-public class PropertiesOfMapsTestCase extends SingleJSPTestCase 
+public class PropertiesOfMapsTestCase extends SingleJSPTestCase
 {
     public PropertiesOfMapsTestCase()
     {
         super("/testdata/jsps/propertiesOfMaps.jsp.data", "/propertiesOfMaps.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("beanWithMapProperties.integerProperty", getELText(_structuredDocument,906));
-        assertEquals("bundle.bundleProp1", getELText(_structuredDocument,982));
-        assertEquals("bundle.x.y", getELText(_structuredDocument,1034));
-        assertEquals("beanWithMapProperties.treeMap.foo", getELText(_structuredDocument,1078));
-        assertEquals("beanWithMapProperties.treeMap.foo.x", getELText(_structuredDocument,1145));
-        assertEquals("beanWithMapProperties.mapProperty.foo", getELText(_structuredDocument,1214));
-        assertEquals("beanWithMapProperties.mapProperty.foo.x", getELText(_structuredDocument,1285));
-        assertEquals("mapBean.foo", getELText(_structuredDocument,1358));
-        assertEquals("mapBean.foo.x", getELText(_structuredDocument,1403));
-        assertEquals("mapBean.getIgnoredIntProperty", getELText(_structuredDocument,1450));
-        assertEquals("bundle.y", getELText(_structuredDocument,1515));
-        assertEquals("bundle.bundleProp1.z", getELText(_structuredDocument,1557));
-    }
-    
-    public void testNoErrorExprs() 
-    {
-        assertNoError(906, Signature.SIG_INT);
-        assertNoError(982, TypeConstants.TYPE_STRING);
-        assertNoError(1034, TypeConstants.TYPE_STRING);
-        assertNoError(1078, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1145, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1214, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1285, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1358, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1403, TypeConstants.TYPE_JAVAOBJECT);
-        assertNoError(1450, TypeConstants.TYPE_JAVAOBJECT);
+        assertEquals("beanWithMapProperties.integerProperty", getELText(_structuredDocument,880));
+        assertEquals("bundle.bundleProp1", getELText(_structuredDocument,955));
+        assertEquals("bundle.x.y", getELText(_structuredDocument,1006));
+        assertEquals("beanWithMapProperties.treeMap.foo", getELText(_structuredDocument,1049));
+        assertEquals("beanWithMapProperties.treeMap.foo.x", getELText(_structuredDocument,1115));
+        assertEquals("beanWithMapProperties.mapProperty.foo", getELText(_structuredDocument,1183));
+        assertEquals("beanWithMapProperties.mapProperty.foo.x", getELText(_structuredDocument,1253));
+        assertEquals("mapBean.foo", getELText(_structuredDocument,1325));
+        assertEquals("mapBean.foo.x", getELText(_structuredDocument,1369));
+        assertEquals("mapBean.getIgnoredIntProperty", getELText(_structuredDocument,1415));
+
+        assertEquals("bundle.y", getELText(_structuredDocument,1478));
+        assertEquals("bundle.bundleProp1.z", getELText(_structuredDocument,1519));
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertSemanticWarning(1515, null, 1);
-        assertSemanticWarning(1557, null, 1);
+        assertNoError(880, Signature.SIG_INT);
+        assertNoError(955, TypeConstants.TYPE_STRING);
+        assertNoError(1006, TypeConstants.TYPE_STRING);
+        assertNoError(1049, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1115, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1183, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1253, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1325, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1369, TypeConstants.TYPE_JAVAOBJECT);
+        assertNoError(1415, TypeConstants.TYPE_JAVAOBJECT);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testWarningExprs()
+    {
+        assertSemanticWarning(1478, null, 1);
+        assertSemanticWarning(1519, null, 1);
+    }
+
+    @Override
+    public void testErrorExprs()
     {
         // do nothing; no error cases
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ResourceBundleTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ResourceBundleTestCase.java
index 4212cf2..7480e4b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ResourceBundleTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/ResourceBundleTestCase.java
@@ -23,100 +23,106 @@
  */
 public class ResourceBundleTestCase extends SingleJSPTestCase {
 
-    public ResourceBundleTestCase() 
+    public ResourceBundleTestCase()
     {
         super("/testdata/jsps/resourceBundleResolution.jsp.data", "/resourceBundle.jsp", JSFVersion.V1_2, FACES_CONFIG_FILE_NAME_1_2 );
     }
 
-    
+
+    @Override
     protected void doStandaloneSetup() {
         super.doStandaloneSetup();
     }
 
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
-        
+
         // add a resource bundle to the default package to test regression on bug 144525
         TestFileResource resource = new TestFileResource();
-        resource.load(ELValidationTestPlugin.getDefault().getBundle(), 
-                      "/testdata/classes/Bundle.properties.data");
-        _jdtTestEnv.addResourceFile("src", new ByteArrayInputStream(resource.toBytes()), 
-                      "", "Bundle.properties");
+        resource.load(ELValidationTestPlugin.getDefault().getBundle(),
+        "/testdata/classes/Bundle.properties.data");
+        _jdtTestEnv.addResourceFile("src", new ByteArrayInputStream(resource.toBytes()),
+                "", "Bundle.properties");
 
         // add a second res bundle to ensure that res bundle is not somehow being
         // confused by a loadBundle variable
         resource = new TestFileResource();
-        resource.load(ELValidationTestPlugin.getDefault().getBundle(), 
-                      "/testdata/classes/Bundle2.properties.data");
-        _jdtTestEnv.addResourceFile("src", new ByteArrayInputStream(resource.toBytes()), 
-                      "beans", "Bundle2.properties");
+        resource.load(ELValidationTestPlugin.getDefault().getBundle(),
+        "/testdata/classes/Bundle2.properties.data");
+        _jdtTestEnv.addResourceFile("src", new ByteArrayInputStream(resource.toBytes()),
+                "beans", "Bundle2.properties");
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("resBundleProp1.bundleProp2", getELText(_structuredDocument,913));
-        assertEquals("noPackageBundle.bundleProp2", getELText(_structuredDocument,970));
-        assertEquals("resBundleProp1.bundleProp1 && myBean.stringProperty", getELText(_structuredDocument,1031));
-        assertEquals("empty resBundleProp1", getELText(_structuredDocument,1116));
-        assertEquals("empty resBundleProp1.bundleProp2", getELText(_structuredDocument,1170));
-        assertEquals("resBundleProp1.bundleProp2 + 5", getELText(_structuredDocument,1236));
-        assertEquals("bundleProp2", getELText(_structuredDocument,1297));
-        assertEquals("resBundleProp1.x.y", getELText(_structuredDocument,1339));
-        assertEquals("noPackageBundle.x.y", getELText(_structuredDocument,1388));
-        assertEquals("resBundleProp2.name", getELText(_structuredDocument,1442));
-        assertEquals("resBundleProp2.movie", getELText(_structuredDocument,1492));
-        
-        assertEquals("-resBundleProp1.bundleProp1", getELText(_structuredDocument,1570));
-        assertEquals("resBundleProp1.bundleProp3", getELText(_structuredDocument,1631));
-        assertEquals("msg", getELText(_structuredDocument,1691));
-        assertEquals("resBundleProp1.x", getELText(_structuredDocument,1728));
-        assertEquals("noPackageBundle.notAProperty", getELText(_structuredDocument,1775));
-        assertEquals("resBundleProp2.bundleProp2", getELText(_structuredDocument,1838));
-        assertEquals("resBundleProp2.notAPropAtAll", getELText(_structuredDocument,1895));
+        assertEquals("resBundleProp1.bundleProp2", getELText(_structuredDocument,887));
+        assertEquals("noPackageBundle.bundleProp2", getELText(_structuredDocument,943));
+        assertEquals("resBundleProp1.bundleProp1 && myBean.stringProperty", getELText(_structuredDocument,1003));
+        assertEquals("empty resBundleProp1", getELText(_structuredDocument,1087));
+        assertEquals("empty resBundleProp1.bundleProp2", getELText(_structuredDocument,1140));
+        assertEquals("resBundleProp1.bundleProp2 + 5", getELText(_structuredDocument,1205));
+        assertEquals("bundleProp2", getELText(_structuredDocument,1265));
+        assertEquals("resBundleProp1.x.y", getELText(_structuredDocument,1306));
+        assertEquals("noPackageBundle.x.y", getELText(_structuredDocument,1354));
+        assertEquals("resBundleProp2.name", getELText(_structuredDocument,1406));
+        assertEquals("resBundleProp2.movie", getELText(_structuredDocument,1455));
+
+        assertEquals("-resBundleProp1.bundleProp1", getELText(_structuredDocument,1530));
+        assertEquals("resBundleProp1.bundleProp3", getELText(_structuredDocument,1590));
+        assertEquals("msg", getELText(_structuredDocument,1649));
+        assertEquals("resBundleProp1.x", getELText(_structuredDocument,1685));
+        assertEquals("noPackageBundle.notAProperty", getELText(_structuredDocument,1731));
+        assertEquals("resBundleProp2.bundleProp2", getELText(_structuredDocument,1792));
+        assertEquals("resBundleProp2.notAPropAtAll", getELText(_structuredDocument,1848));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(913, TypeConstants.TYPE_STRING);
-        assertNoError(970, TypeConstants.TYPE_STRING);
-        assertNoError(1031, Signature.SIG_BOOLEAN);
-        assertNoError(1116, Signature.SIG_BOOLEAN);
-        assertNoError(1170, Signature.SIG_BOOLEAN);
-        assertNoError(1236, Signature.SIG_LONG);
-        //assertNoError(1297, TypeConstants.TYPE_MAP);
-        assertNoError(1339, TypeConstants.TYPE_STRING);
-        assertNoError(1388, TypeConstants.TYPE_STRING);
-        assertNoError(1442, TypeConstants.TYPE_STRING);
-        assertNoError(1492, TypeConstants.TYPE_STRING);
+        assertNoError(887, TypeConstants.TYPE_STRING);
+        assertNoError(943, TypeConstants.TYPE_STRING);
+        assertNoError(1003, Signature.SIG_BOOLEAN);
+        assertNoError(1087, Signature.SIG_BOOLEAN);
+        assertNoError(1140, Signature.SIG_BOOLEAN);
+        assertNoError(1205, Signature.SIG_LONG);
+        //assertNoError(1265, TypeConstants.TYPE_MAP);
+        assertNoError(1306, TypeConstants.TYPE_STRING);
+        assertNoError(1354, TypeConstants.TYPE_STRING);
+        assertNoError(1406, TypeConstants.TYPE_STRING);
+        assertNoError(1455, TypeConstants.TYPE_STRING);
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> problems = assertSemanticWarning(1570, null, 1);
+        List<IMessage> problems = assertSemanticWarning(1530, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED_ID);
 
-        problems = assertSemanticWarning(1631, null, 1);
+        problems = assertSemanticWarning(1590, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        problems = assertSemanticWarning(1691, null, 1);
+        problems = assertSemanticWarning(1649, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.VARIABLE_NOT_FOUND_ID);
 
-        problems = assertSemanticWarning(1728, null, 1);
+        problems = assertSemanticWarning(1685, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.MEMBER_IS_INTERMEDIATE_ID);
 
-        problems = assertSemanticWarning(1775, null, 1);
+        problems = assertSemanticWarning(1731, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        problems = assertSemanticWarning(1838, null, 1);
+        problems = assertSemanticWarning(1792, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
 
-        problems = assertSemanticWarning(1895, null, 1);
+        problems = assertSemanticWarning(1848, null, 1);
         assertContainsProblem(problems, DiagnosticFactory.MEMBER_NOT_FOUND_ID);
     }
 
-    public void testErrorExprs() 
+    @Override
+    public void testErrorExprs()
     {
         // no errors
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/SyntaxCheckTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/SyntaxCheckTestCase.java
index dc03df7..88d7e71 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/SyntaxCheckTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/SyntaxCheckTestCase.java
@@ -4,12 +4,12 @@
 import org.eclipse.jst.jsf.validation.el.tests.base.SingleJSPTestCase;
 import org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;
 
-public class SyntaxCheckTestCase extends SingleJSPTestCase 
+public class SyntaxCheckTestCase extends SingleJSPTestCase
 {
     private final JSPSemanticsValidator validator;
-    
-    protected SyntaxCheckTestCase(String srcFileName, String destFileName,
-            String defaultJSFVersion, String defaultFacesConfigFile) 
+
+    protected SyntaxCheckTestCase(final String srcFileName, final String destFileName,
+            final String defaultJSFVersion, final String defaultFacesConfigFile)
     {
         super("/testdata/jsps/syntaxCheck.jsp.data", "/syntaxCheck.jsp", JSFVersion.V1_1, FACES_CONFIG_FILE_NAME_1_1);
         validator = new JSPSemanticsValidator();
@@ -27,28 +27,28 @@
     }
 
     @Override
-    public void testWarningExprs() 
+    public void testWarningExprs()
     {
-//        IStructuredDocumentContext context = 
-//            IStructuredDocumentContextFactory.INSTANCE.getContext(_structuredDocument, 877);
-//        ITextRegionContextResolver resolver =
-//            IStructuredDocumentContextResolverFactory.INSTANCE.getTextRegionResolver(context);
+        //        IStructuredDocumentContext context =
+        //            IStructuredDocumentContextFactory.INSTANCE.getContext(_structuredDocument, 877);
+        //        ITextRegionContextResolver resolver =
+        //            IStructuredDocumentContextResolverFactory.INSTANCE.getTextRegionResolver(context);
 
-    
+
     }
 
     @Override
     public void testErrorExprs() {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void testNoErrorExprs()
     {
         // do nothing
-        
+
     }
 
-    
+
 }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/UnaryEmptyTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/UnaryEmptyTestCase.java
index f16c38d..a538eaf 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/UnaryEmptyTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/UnaryEmptyTestCase.java
@@ -13,80 +13,85 @@
  * 
  * @author cbateman
  */
-public class UnaryEmptyTestCase extends SingleJSPTestCase 
+public class UnaryEmptyTestCase extends SingleJSPTestCase
 {
     public UnaryEmptyTestCase()
     {
         super("/testdata/jsps/emptyOperator.jsp.data", "/emptyOperator.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
-    protected void setUp() throws Exception 
+    @Override
+    protected void setUp() throws Exception
     {
         super.setUp();
     }
-    
+
+    @Override
     public void testSanity()
     {
         super.testSanity();
-        
-        assertEquals("empty myBean.collectionProperty", getELText(_structuredDocument,852));
-        assertEquals("empty myBean.mapProperty", getELText(_structuredDocument,917));
-        assertEquals("empty myBean.stringArrayProperty", getELText(_structuredDocument,975));
-        assertEquals("empty myBean.stringProperty", getELText(_structuredDocument,1041));
-        assertEquals("myBean.stringProperty", getELText(_structuredDocument,1102));
-        assertEquals("empty myBean.listProperty", getELText(_structuredDocument,1157));
-        assertEquals("empty mapBean", getELText(_structuredDocument,1213));
-        
-        assertEquals("empty 5", getELText(_structuredDocument,1283));
-        assertEquals("empty myBean.integerProperty", getELText(_structuredDocument,1321));
-        assertEquals("empty false", getELText(_structuredDocument,1380));
-        assertEquals("empty myBean.booleanProperty", getELText(_structuredDocument,1422));
-        assertEquals("empty ''", getELText(_structuredDocument,1481));
-        assertEquals("empty 'notEmpty'", getELText(_structuredDocument,1523));
-        assertEquals("empty null", getELText(_structuredDocument,1574));
-        assertEquals("empty 456", getELText(_structuredDocument,1618));
+
+        assertEquals("empty myBean.collectionProperty", getELText(_structuredDocument,828));
+        assertEquals("empty myBean.mapProperty", getELText(_structuredDocument,892));
+        assertEquals("empty myBean.stringArrayProperty", getELText(_structuredDocument,949));
+        assertEquals("empty myBean.stringProperty", getELText(_structuredDocument,1014));
+        assertEquals("myBean.stringProperty", getELText(_structuredDocument,1074));
+        assertEquals("empty myBean.listProperty", getELText(_structuredDocument,1128));
+        assertEquals("empty mapBean", getELText(_structuredDocument,1183));
+
+        assertEquals("empty 5", getELText(_structuredDocument,1250));
+        assertEquals("empty myBean.integerProperty", getELText(_structuredDocument,1287));
+        assertEquals("empty false", getELText(_structuredDocument,1345));
+        assertEquals("empty myBean.booleanProperty", getELText(_structuredDocument,1386));
+        assertEquals("empty ''", getELText(_structuredDocument,1444));
+        assertEquals("empty 'notEmpty'", getELText(_structuredDocument,1485));
+        assertEquals("empty null", getELText(_structuredDocument,1535));
+        assertEquals("empty 456", getELText(_structuredDocument,1578));
     }
 
-    public void testNoErrorExprs() 
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(852, Signature.SIG_BOOLEAN);
-        assertNoError(917, Signature.SIG_BOOLEAN);
-        assertNoError(975, Signature.SIG_BOOLEAN);
-        assertNoError(1041, Signature.SIG_BOOLEAN);
-//        assertNoError(1102, Signature.SIG_BOOLEAN);
-        assertNoError(1157, Signature.SIG_BOOLEAN);
-        assertNoError(1213, Signature.SIG_BOOLEAN);
+        assertNoError(828, Signature.SIG_BOOLEAN);
+        assertNoError(892, Signature.SIG_BOOLEAN);
+        assertNoError(949, Signature.SIG_BOOLEAN);
+        assertNoError(1014, Signature.SIG_BOOLEAN);
+        //        assertNoError(1074, Signature.SIG_BOOLEAN);
+        assertNoError(1128, Signature.SIG_BOOLEAN);
+        assertNoError(1183, Signature.SIG_BOOLEAN);
 
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1283, Signature.SIG_BOOLEAN, 1);
+        List<IMessage> list = assertSemanticWarning(1250, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE_ID);
 
-        list = assertSemanticWarning(1321, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1287, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE_ID);
 
-        list = assertSemanticWarning(1380, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1345, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE_ID);
 
-        list = assertSemanticWarning(1422, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1386, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE_ID);
 
-        list = assertSemanticWarning(1481, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1444, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1523, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1485, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1574, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1535, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID);
 
-        list = assertSemanticWarning(1618, Signature.SIG_BOOLEAN, 1);
+        list = assertSemanticWarning(1578, Signature.SIG_BOOLEAN, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE_ID);
     }
-    
-    public void testErrorExprs() 
+
+    @Override
+    public void testErrorExprs()
     {
         // no error cases
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/UnaryMinusTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/UnaryMinusTestCase.java
index e3643ac..37f8523 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/UnaryMinusTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/jsp/UnaryMinusTestCase.java
@@ -14,84 +14,89 @@
  * 
  * @author cbateman
  */
-public class UnaryMinusTestCase extends SingleJSPTestCase 
+public class UnaryMinusTestCase extends SingleJSPTestCase
 {
     public UnaryMinusTestCase()
     {
         super("/testdata/jsps/unaryMinus.jsp.data", "/unaryMinus.jsp", JSFVersion.V1_1,FACES_CONFIG_FILE_NAME_1_1);
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("-myBean.integerProperty", getELText(_structuredDocument,852));
-        assertEquals("-myBean.doubleProperty", getELText(_structuredDocument,906));
-        assertEquals("-myBean.bigDoubleProperty", getELText(_structuredDocument,959));
-        assertEquals("-myBean.bigIntegerProperty", getELText(_structuredDocument,1015));
+        assertEquals("-myBean.integerProperty", getELText(_structuredDocument,828));
+        assertEquals("-myBean.doubleProperty", getELText(_structuredDocument,881));
+        assertEquals("-myBean.bigDoubleProperty", getELText(_structuredDocument,933));
+        assertEquals("-myBean.bigIntegerProperty", getELText(_structuredDocument,988));
+        assertEquals("-5", getELText(_structuredDocument,1127));
+        assertEquals("-5.5", getELText(_structuredDocument,1162));
+        assertEquals("-'5'", getELText(_structuredDocument,1199));
+        assertEquals("-'5.5'", getELText(_structuredDocument,1236));
 
-        assertEquals("-myBean.stringProperty", getELText(_structuredDocument,1102));
-        assertEquals("-5", getELText(_structuredDocument,1158));
-        assertEquals("-5.5", getELText(_structuredDocument,1194));
-        assertEquals("-'5'", getELText(_structuredDocument,1232));
-        assertEquals("-'5.5'", getELText(_structuredDocument,1270));
-        assertEquals("-null", getELText(_structuredDocument,1310));
+        assertEquals("-myBean.stringProperty", getELText(_structuredDocument,1072));
+        assertEquals("-null", getELText(_structuredDocument,1275));
 
-        assertEquals("-false", getELText(_structuredDocument,1370));
-        assertEquals("-true", getELText(_structuredDocument,1407));
-        assertEquals("-myBean.booleanProperty", getELText(_structuredDocument,1443));
-        assertEquals("-myBean.collectionProperty", getELText(_structuredDocument,1497));
-        assertEquals("-myBean.mapProperty", getELText(_structuredDocument,1554));
-        assertEquals("-myBean.stringArrayProperty", getELText(_structuredDocument,1604));
-        assertEquals("-'notANumber'", getELText(_structuredDocument,1662));
+        assertEquals("-false", getELText(_structuredDocument,1332));
+        assertEquals("-true", getELText(_structuredDocument,1368));
+        assertEquals("-myBean.booleanProperty", getELText(_structuredDocument,1403));
+        assertEquals("-myBean.collectionProperty", getELText(_structuredDocument,1456));
+        assertEquals("-myBean.mapProperty", getELText(_structuredDocument,1512));
+        assertEquals("-myBean.stringArrayProperty", getELText(_structuredDocument,1561));
+        assertEquals("-'notANumber'", getELText(_structuredDocument,1618));
     }
-    
-    public void testNoErrorExprs() 
+
+    @Override
+    public void testNoErrorExprs()
     {
-        assertNoError(852, Signature.SIG_INT);
-        assertNoError(906, Signature.SIG_DOUBLE);
-        assertNoError(959, TypeConstants.TYPE_BIG_DOUBLE);
-        assertNoError(1015, TypeConstants.TYPE_BIG_INTEGER);
-        assertNoError(1158, Signature.SIG_LONG);
-        assertNoError(1194, Signature.SIG_DOUBLE);
-        assertNoError(1232, Signature.SIG_LONG);
-        assertNoError(1270, Signature.SIG_DOUBLE);
+        assertNoError(828, Signature.SIG_INT);
+        assertNoError(881, Signature.SIG_DOUBLE);
+        assertNoError(933, TypeConstants.TYPE_BIG_DOUBLE);
+        assertNoError(988, TypeConstants.TYPE_BIG_INTEGER);
+        assertNoError(1127, Signature.SIG_LONG);
+        assertNoError(1162, Signature.SIG_DOUBLE);
+        assertNoError(1199, Signature.SIG_LONG);
+        assertNoError(1236, Signature.SIG_DOUBLE);
 
     }
 
-    public void testWarningExprs() 
+    @Override
+    public void testWarningExprs()
     {
-        List<IMessage> list = assertSemanticWarning(1102, Signature.SIG_LONG, 1);
+        List<IMessage> list = assertSemanticWarning(1072, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED_ID);
 
-        list = assertSemanticWarning(1310, Signature.SIG_LONG, 1);
+        list = assertSemanticWarning(1275, Signature.SIG_LONG, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_MINUS_ON_NULL_ALWAYS_ZERO_ID);
     }
-    
-    public void testErrorExprs() 
+
+    @Override
+    public void testErrorExprs()
     {
-        List<IMessage> list = assertSemanticError(1370, null, 1);
+        List<IMessage> list = assertSemanticError(1332, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1407, null, 1);
+        list = assertSemanticError(1368, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1443, null, 1);
+        list = assertSemanticError(1403, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1497, null, 1);
+        list = assertSemanticError(1456, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1554, null, 1);
+        list = assertSemanticError(1512, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1604, null, 1);
+        list = assertSemanticError(1561, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
 
-        list = assertSemanticError(1662, null, 1);
+        list = assertSemanticError(1618, null, 1);
         assertContainsProblem(list, DiagnosticFactory.UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION_ID);
     }
 
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/preferences/EndToEndTestCase.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/preferences/EndToEndTestCase.java
index a06a330..526b632 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/preferences/EndToEndTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/preferences/EndToEndTestCase.java
@@ -7,10 +7,9 @@
  *
  * Contributors:
  *    Cameron Bateman - initial implementation
- *******************************************************************************/ 
+ *******************************************************************************/
 package org.eclipse.jst.jsf.validation.el.tests.preferences;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
@@ -40,25 +39,25 @@
     private IStructuredModel        _structuredModel;
     private IStructuredDocument     _structuredDocument;
     private ELValidationPreferences _prefs;
-    
-    
+
+
     @Override
-    protected void setUp() throws Exception 
+    protected void setUp() throws Exception
     {
         super.setUp();
-        
+
         _testJSP = loadJSP("/testdata/jsps/preferenceTest1.jsp.data", "/preferenceTest1.jsp");
-        
+
         _structuredModel = StructuredModelManager.getModelManager().getModelForRead(_testJSP);
         _structuredDocument = _structuredModel.getStructuredDocument();
-        
+
         _prefs = new ELValidationPreferences();
         _prefs.load(JSFCorePlugin.getDefault().getPreferenceStore());
         PrefTestUtil.assertExpectedDefaults(_prefs);
     }
 
     @Override
-    protected void tearDown() throws Exception 
+    protected void tearDown() throws Exception
     {
         super.tearDown();
 
@@ -74,89 +73,89 @@
         ((IPersistentPreferenceStore)JSFCorePlugin.getDefault().getPreferenceStore()).save();
     }
 
+    @Override
     public void testSanity()
     {
-        assertEquals("5+3", getELText(_structuredDocument,823));
-        assertEquals("null+null", getELText(_structuredDocument,856));
-        assertEquals("5 + true", getELText(_structuredDocument,902));
-        assertEquals("'a' + 'b'", getELText(_structuredDocument,947));
-        assertEquals("5 / 0", getELText(_structuredDocument,986));
-        assertEquals("myBean.subClassStringProperty", getELText(_structuredDocument,1058));
-        assertEquals("myBean1", getELText(_structuredDocument,1124));
-        assertEquals("listBean[-1]", getELText(_structuredDocument,1161));
-        assertEquals("myBean.stringArrayProperty > myBean.booleanProperty", getELText(_structuredDocument,1210));
-        assertEquals("myBean.coins > myBean.colors", getELText(_structuredDocument,1298));
-        assertEquals("false && myBean.booleanProperty", getELText(_structuredDocument,1363));
-        assertEquals("myBean.booleanProperty && false", getELText(_structuredDocument,1431));
-        assertEquals("5 == true", getELText(_structuredDocument,1499));
-        assertEquals("!false", getELText(_structuredDocument,1545));
-        assertEquals("!5", getELText(_structuredDocument,1588));
-        assertEquals("myBean.doubleProperty + myBean.getIntegerProperty", getELText(_structuredDocument,1627));
+        assertEquals("5+3", getELText(_structuredDocument,799));
+        assertEquals("null+null", getELText(_structuredDocument,831));
+        assertEquals("5 + true", getELText(_structuredDocument,876));
+        assertEquals("'a' + 'b'", getELText(_structuredDocument,920));
+        assertEquals("5 / 0", getELText(_structuredDocument,958));
+        assertEquals("myBean.subClassStringProperty", getELText(_structuredDocument,1028));
+        assertEquals("myBean1", getELText(_structuredDocument,1093));
+        assertEquals("listBean[-1]", getELText(_structuredDocument,1129));
+        assertEquals("myBean.stringArrayProperty > myBean.booleanProperty", getELText(_structuredDocument,1177));
+        assertEquals("myBean.coins > myBean.colors", getELText(_structuredDocument,1264));
+        assertEquals("false && myBean.booleanProperty", getELText(_structuredDocument,1328));
+        assertEquals("myBean.booleanProperty && false", getELText(_structuredDocument,1395));
+        assertEquals("5 == true", getELText(_structuredDocument,1462));
+        assertEquals("!false", getELText(_structuredDocument,1507));
+        assertEquals("!5", getELText(_structuredDocument,1549));
+        assertEquals("myBean.doubleProperty + myBean.getIntegerProperty", getELText(_structuredDocument,1587));
+
     }
-    
+
     public void testIgnoreAll() throws Exception
     {
         testSeverityAll(Diagnostic.OK, 0);
     }
-    
+
     public void testWarningsAll() throws Exception
     {
         testSeverityAll(Diagnostic.WARNING, IMessage.NORMAL_SEVERITY);
     }
-    
+
     public void testErrorAll() throws Exception
     {
         testSeverityAll(Diagnostic.ERROR, IMessage.HIGH_SEVERITY);
     }
-    
-    
-    private void testSeverityAll(int diagSeverity, int messageSeverity) throws Exception
+
+
+    private void testSeverityAll(final int diagSeverity, final int messageSeverity) throws Exception
     {
-        final Severity severity = 
+        final Severity severity =
             ELValidationPreferences.mapDiagToSeverity(diagSeverity);
         PrefTestUtil.setByKey(severity, _prefs);
         PrefTestUtil.assertSetByKey(severity, _prefs);
-        
-        final  IPreferenceStore  prefStore = 
+
+        final  IPreferenceStore  prefStore =
             JSFCorePlugin.getDefault().getPreferenceStore();
         _prefs.commit(prefStore);
         ((IPersistentPreferenceStore)prefStore).save();
         _prefs.load(prefStore);
-        
-        assertErrorLevel(823, messageSeverity);
-        assertErrorLevel(856, messageSeverity);
-        assertErrorLevel(902, messageSeverity);
-        assertErrorLevel(947, messageSeverity);
-        assertErrorLevel(986, messageSeverity);
-        assertErrorLevel(1058, messageSeverity);
-        assertErrorLevel(1124, messageSeverity);
-        assertErrorLevel(1161, messageSeverity);
-        assertErrorLevel(1210, messageSeverity);
-        assertErrorLevel(1298, messageSeverity);
-        assertErrorLevel(1363, messageSeverity);
-        assertErrorLevel(1431, messageSeverity);
-        assertErrorLevel(1499, messageSeverity);
-        assertErrorLevel(1545, messageSeverity);
-        assertErrorLevel(1588, messageSeverity);
-        assertErrorLevel(1627, messageSeverity);
+
+        assertErrorLevel(799, messageSeverity);
+        assertErrorLevel(831, messageSeverity);
+        assertErrorLevel(876, messageSeverity);
+        assertErrorLevel(920, messageSeverity);
+        assertErrorLevel(958, messageSeverity);
+        assertErrorLevel(1028, messageSeverity);
+        assertErrorLevel(1093, messageSeverity);
+        assertErrorLevel(1129, messageSeverity);
+        assertErrorLevel(1177, messageSeverity);
+        assertErrorLevel(1264, messageSeverity);
+        assertErrorLevel(1328, messageSeverity);
+        assertErrorLevel(1395, messageSeverity);
+        assertErrorLevel(1462, messageSeverity);
+        assertErrorLevel(1507, messageSeverity);
+        assertErrorLevel(1549, messageSeverity);
+        assertErrorLevel(1587, messageSeverity);
     }
-    
+
     private void assertErrorLevel(final int docPos, final int severity)
     {
-        ELExpressionValidator validator = createELValidator(_structuredDocument, docPos, _testJSP);
+        final ELExpressionValidator validator = createELValidator(_structuredDocument, docPos, _testJSP);
         validator.validateXMLNode();
-        List<IMessage> syntaxProblems = validator.getSyntaxProblems();
-        
-        for (final Iterator<IMessage> it = syntaxProblems.iterator(); it.hasNext();)
+        final List<IMessage> syntaxProblems = validator.getSyntaxProblems();
+
+        for (final IMessage message : syntaxProblems)
         {
-            IMessage message = it.next();
             assertEquals(severity, message.getSeverity());
         }
 
-        List<IMessage> semanticProblems = validator.getSemanticValidator().getMessages();
-        for (final Iterator<IMessage> it = semanticProblems.iterator(); it.hasNext();)
+        final List<IMessage> semanticProblems = validator.getSemanticValidator().getMessages();
+        for (final IMessage message : semanticProblems)
         {
-            IMessage message = it.next();
             assertEquals(severity, message.getSeverity());
         }
     }
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/util/CreateTestCaseForJSP.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/util/CreateTestCaseForJSP.java
index a25f2b4..e1dbdba 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/util/CreateTestCaseForJSP.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/util/CreateTestCaseForJSP.java
@@ -22,46 +22,48 @@
  * 
  * @author cbateman
  */
-public class CreateTestCaseForJSP extends TestCase 
+public class CreateTestCaseForJSP extends TestCase
 {
-    private final static String  jspFile = "greaterThanEq";
+    private final static String  jspFile = "preferenceTest1";
     private static IFile  file;
     private static IStructuredModel model;
 
     private WebProjectTestEnvironment  _testEnv;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
 
         _testEnv = new WebProjectTestEnvironment("ELValidationTest_"+getName());
         _testEnv.createProject(false);
-        assertNotNull(_testEnv);    
+        assertNotNull(_testEnv);
         assertNotNull(_testEnv.getTestProject());
         assertTrue(_testEnv.getTestProject().isAccessible());
 
-        file = 
+        file =
             (IFile)
             _testEnv.loadResourceInWebRoot(
-                ELValidationTestPlugin.getDefault().getBundle(),
-                "/testdata/jsps/"+jspFile+".jsp.data", 
-                "/WEB-INF/"+jspFile+".jsp");
+                    ELValidationTestPlugin.getDefault().getBundle(),
+                    "/testdata/jsps/"+jspFile+".jsp.data",
+                    "/WEB-INF/"+jspFile+".jsp");
 
         model = StructuredModelManager.getModelManager().getModelForRead(file);
 
     }
 
-    protected void tearDown() throws Exception 
+    @Override
+    protected void tearDown() throws Exception
     {
         super.tearDown();
         model.releaseFromRead();
     }
-    
+
     /**
      * Test gen
      */
     public void testDoTestGen()
     {
-        System.out.println("    protected void setUp() throws Exception"); 
+        System.out.println("    protected void setUp() throws Exception");
         System.out.println("    {");
         System.out.println("        _srcFileName = \"/testdata/jsps/"+jspFile+".jsp.data\";");
         System.out.println("        _destFileName = \"/"+jspFile+".jsp\";");
@@ -70,14 +72,14 @@
 
         System.out.println("    public void testSanity()");
         System.out.println("    {");
-        ELRegionHandler  handler = new ELRegionHandler()
+        final ELRegionHandler  handler = new ELRegionHandler()
         {
             public void handleRegion(ITextRegionCollection parentRegion, ITextRegion elRegion) {
-                final int contentStart = 
+                final int contentStart =
                     parentRegion.getStartOffset(elRegion);
-                
+
                 final String elTextStr = "\""+parentRegion.getText(elRegion)+ "\"";
-                
+
                 System.out.println("        assertEquals("+elTextStr+", getELText(_structuredDocument,"+contentStart+"));");
             }
         };
@@ -91,33 +93,33 @@
      * @param document
      * @param handler
      */
-    public static void processJSP(IStructuredDocument document, ELRegionHandler handler)
+    public static void processJSP(final IStructuredDocument document, final ELRegionHandler handler)
     {
         IStructuredDocumentRegion curNode = document.getFirstStructuredDocumentRegion();
         while (null != curNode)
         {
-            if (curNode.getFirstRegion().getType() == DOMRegionContext.XML_TAG_OPEN ) 
+            if (curNode.getFirstRegion().getType() == DOMRegionContext.XML_TAG_OPEN )
             {
-                Iterator<?> regions = curNode.getRegions().iterator();
+                final Iterator<?> regions = curNode.getRegions().iterator();
                 ITextRegion region = null;
 
-                while (regions.hasNext()) 
+                while (regions.hasNext())
                 {
                     region = (ITextRegion) regions.next();
 
                     if (region instanceof ITextRegionCollection
                             && region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)
                     {
-                        ITextRegionCollection parentRegion = (ITextRegionCollection) region;
+                        final ITextRegionCollection parentRegion = (ITextRegionCollection) region;
                         final ITextRegionList  regionList = parentRegion.getRegions();
                         if (regionList.size() >= 4)
                         {
-                            ITextRegion  openQuote = regionList.get(0);
-                            ITextRegion  openVBLQuote = regionList.get(1);
-        
+                            final ITextRegion  openQuote = regionList.get(0);
+                            final ITextRegion  openVBLQuote = regionList.get(1);
+
                             if (    (openQuote.getType() == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE
-                                        || openQuote.getType() == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE)
-                                        && (openVBLQuote.getType() == DOMJSPRegionContexts.JSP_VBL_OPEN))
+                                    || openQuote.getType() == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE)
+                                    && (openVBLQuote.getType() == DOMJSPRegionContexts.JSP_VBL_OPEN))
                             {
                                 // we appear to be inside "#{", so next should be a VBL_CONTENT if there's anything
                                 // here to validate
@@ -129,12 +131,12 @@
                             }
                         }
                     }
-                }             
+                }
             }
             curNode = curNode.getNext();
         }
     }
-    
+
     /**
      * Used as a callback interface when an EL region is found in a StructuredModel
      * 
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/util/FindELRegions.java b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/util/FindELRegions.java
index 8b71237..6989f32 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/util/FindELRegions.java
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/src/org/eclipse/jst/jsf/validation/el/tests/util/FindELRegions.java
@@ -28,7 +28,6 @@
         , "arithmeticMultiply"
         , "assignability"
         , "badSyntax"
-        , "beanScoping"
         , "beansProperties"
         , "beanSubClass"
         , "builtinSymbols"
@@ -54,45 +53,47 @@
         , "unaryMinus"
         , "variableNaming"
     };
-    
+
     private final static IFile[]  files = new IFile[jspFiles.length];
     private final static IStructuredModel[]  models = new IStructuredModel[jspFiles.length];
 
-    
+
     private WebProjectTestEnvironment  _testEnv;
-    
-  
+
+
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
 
         _testEnv = new WebProjectTestEnvironment("ELValidationTest_"+getName());
         _testEnv.createProject(false);
-        assertNotNull(_testEnv);       
+        assertNotNull(_testEnv);
         assertNotNull(_testEnv.getTestProject());
         assertTrue(_testEnv.getTestProject().isAccessible());
 
         for (int i = 0; i < jspFiles.length; i++)
         {
-            files[i] = 
-                (IFile) 
+            files[i] =
+                (IFile)
                 _testEnv.loadResourceInWebRoot(ELValidationTestPlugin.getDefault().getBundle(),
-                    "/testdata/jsps/"+jspFiles[i]+".jsp.data", 
-                    "/WEB-INF/"+jspFiles[i]+".jsp");
-            
+                        "/testdata/jsps/"+jspFiles[i]+".jsp.data",
+                        "/WEB-INF/"+jspFiles[i]+".jsp");
+
             models[i] = StructuredModelManager.getModelManager().getModelForRead(files[i]);
         }
     }
 
-    protected void tearDown() throws Exception 
+    @Override
+    protected void tearDown() throws Exception
     {
         super.tearDown();
-        
+
         for (int i = 0; i < jspFiles.length; i++)
         {
             models[i].releaseFromRead();
         }
     }
-    
+
     /**
      * Prints assertions for all regions in all models
      */
@@ -103,19 +104,19 @@
             printRegionsForModel(i);
         }
     }
-    
-    
-    
-    private void printRegionsForModel(int i)
+
+
+
+    private void printRegionsForModel(final int i)
     {
-        IStructuredDocument document = models[i].getStructuredDocument();
-        
-        ELRegionHandler handler = new ELRegionHandler()
+        final IStructuredDocument document = models[i].getStructuredDocument();
+
+        final ELRegionHandler handler = new ELRegionHandler()
         {
             public void handleRegion(ITextRegionCollection parentRegion, ITextRegion elRegion) {
-                final int contentStart = 
+                final int contentStart =
                     parentRegion.getStartOffset(elRegion);
-                
+
                 final String elTextStr = "\""+parentRegion.getText(elRegion)+ "\"";
                 System.out.println("assertEquals("+elTextStr+", getELText(_structuredDocument,"+contentStart+"));");