datastate() acceptance test adjustment to add classes, and _classes and _variables lists