Merge "Remove skips for VariableTableTest & VariableTableWithGenericTest"