Updated interfaces and fixed tests.
Cosmetics.