Split new interface in two.
Update some test expected results.