-my $res = cast %h, $wiz;
-ok($res, 'uvar : cast succeeded');
-check( 'uvar : cast didn\'t triggered the callback');
-
-my $x = $h{a};
-++$x[0];
-check( 'uvar : fetch directly');
-ok($x, 'uvar : fetch directly correctly');
-
-$x = "$h{b}";
-++$x[0];
-check( 'uvar : fetch by interpolation');
-is($x, 2, 'uvar : fetch by interpolation correctly');
-
-$h{c} = 4;
-++$x[1];
-check('uvar : store directly');
-
-$x = $h{c} = 5;
-++$x[1];
-check( 'uvar : fetch and store');
-is($x, 5, 'uvar : fetch and store correctly');
-
-$x = exists $h{c};
-++$x[2];
-check( 'uvar : exists');
-ok($x, 'uvar : exists correctly');
-
-$x = delete $h{c};
-++$x[3];
-check( 'uvar : delete existing key');
-is($x, 5, 'uvar : delete existing key correctly');
-
-$x = delete $h{z};
-++$x[3];
-check( 'uvar : delete non-existing key');
-ok(!defined $x, 'uvar : delete non-existing key correctly');
-
-my $wiz2 = wizard 'fetch' => sub { 0 };
+
+my $res = watch { cast %h, $wiz } { }, 'cast';
+ok $res, 'uvar: cast succeeded';
+
+my $x = watch { $h{a} } { fetch => 1 }, 'fetch directly';
+is $x, 1, 'uvar: fetch directly correctly';
+
+$x = watch { "$h{b}" } { fetch => 1 }, 'fetch by interpolation';
+is $x, 2, 'uvar: fetch by interpolation correctly';
+
+watch { $h{c} = 4 } { store => 1 }, 'store directly';
+
+$x = watch { $h{c} = 5 } { store => 1 }, 'fetch and store';
+is $x, 5, 'uvar: fetch and store correctly';
+
+$x = watch { exists $h{c} } { exists => 1 }, 'exists';
+ok $x, 'uvar: exists correctly';
+
+$x = watch { delete $h{c} } { delete => 1 }, 'delete existing key';
+is $x, 5, 'uvar: delete existing key correctly';
+
+$x = watch { delete $h{z} } { delete => 1 }, 'delete non-existing key';
+ok !defined $x, 'uvar: delete non-existing key correctly';
+
+my $wiz2 = wizard get => sub { 0 };
+cast %h, $wiz2;
+
+$x = watch { $h{a} } { fetch => 1 }, 'fetch directly with also non uvar magic';
+is $x, 1, 'uvar: fetch directly with also non uvar magic correctly';
+
+SKIP: {
+ load_or_skip('Tie::Hash', undef, undef, 2 * 5 + 4);
+
+ tie my %h, 'Tie::StdHash';
+ %h = (x => 7, y => 8);
+
+ $res = watch { cast %h, $wiz } { }, 'cast on tied hash';
+ ok $res, 'uvar: cast on tied hash succeeded';
+
+ $x = watch { $h{x} } { fetch => 1 }, 'fetch on tied hash';
+ is $x, 7, 'uvar: fetch on tied hash succeeded';
+
+ watch { $h{x} = 9 } { store => 1 }, 'store on tied hash';
+
+ $x = watch { exists $h{x} } { exists => 1 }, 'exists on tied hash';
+ ok $x, 'uvar: exists on tied hash succeeded';
+
+ $x = watch { delete $h{x} } { delete => 1 }, 'delete on tied hash';
+ is $x, 9, 'uvar: delete on tied hash succeeded';
+}
+
+$wiz2 = wizard fetch => sub { 0 };