cleaned up test code, now only depends on controller's public intf