Add some tests for the new interface