Update to test case and variableref.java