Added variable tests from old implementation - passing!