New test interface

No, it's fine, as long as there's a rationale, and it was not just the unintended result of historical refactorings.