Don't call superassistant methods by default, enable calling them explicitly
Fix test failures after previous tests