Bug 22200: Add Tests for change