Could you convert all of the `unwrap`s you added to comparing against `Some('...')`? It makes test failures much easier to diagnose.