Update tests to new interfaces.