Updating interfaces and tests.