Added wrap and unwrap tests