Fixed unwrap method, added tests

Tests are passing