Added unwrap method and tests

Test passing.