Add tests for changeset b643ad29761fb9a67ba07105d4b7a49d53298260