New test interface

And same here.