Finish change. Fix tests.