CR fixes, more tests in ContainerChangeTypeAdapterTest