Update code and tests.