New test interface

And filed as #1311