Redoing tests for the new interface.