Issue #237 Add support for RawValue to be able to support Dataset.Engine
Issue #237 Fix broken test