Implemented ValueUnwrapper. Tests still fail