Improved ContextValues freeze tests