Fix tests.  Q's api is subtlely different than when's