Fixes #19 - Test unwrap