Add missing changes and a test.