Workaround some current testing limitations.

  - Also this whole interface will be subject to change anyway.