Implement interface and update tests.