diff --git a/Package-Stash-0.23-no-Test::Requires.patch b/Package-Stash-0.31-no-Test::Requires.patch
similarity index 54%
rename from Package-Stash-0.23-no-Test::Requires.patch
rename to Package-Stash-0.31-no-Test::Requires.patch
index 69d264d..0fb6de9 100644
--- a/Package-Stash-0.23-no-Test::Requires.patch
+++ b/Package-Stash-0.31-no-Test::Requires.patch
@@ -1,5 +1,5 @@
---- Package-Stash-0.23/t/impl-selection/11-basic-xs.t	2011-01-04 16:31:03.410468453 +0000
-+++ Package-Stash-0.23/t/impl-selection/11-basic-xs.t	2011-01-04 16:31:03.413468538 +0000
+--- Package-Stash/t/impl-selection/basic-xs.t
++++ Package-Stash/t/impl-selection/basic-xs.t
 @@ -3,7 +3,7 @@ use strict;
  use warnings;
  use Test::More tests => 124;
diff --git a/Package-Stash-0.26-old-Test::More.patch b/Package-Stash-0.31-old-Test::More.patch
similarity index 50%
rename from Package-Stash-0.26-old-Test::More.patch
rename to Package-Stash-0.31-old-Test::More.patch
index 3af216b..bce494a 100644
--- a/Package-Stash-0.26-old-Test::More.patch
+++ b/Package-Stash-0.31-old-Test::More.patch
@@ -1,100 +1,6 @@
-diff -up Package-Stash-0.26/t/01-basic.t.orig Package-Stash-0.26/t/01-basic.t
---- Package-Stash-0.26/t/01-basic.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/01-basic.t	2011-03-05 10:03:21.020143527 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 122;
- use Test::Fatal;
- 
- use Package::Stash;
-@@ -416,5 +416,3 @@ like(exception {
-         "list_all_symbols CODE",
-     );
- }
--
--done_testing;
-diff -up Package-Stash-0.26/t/02-extension.t.orig Package-Stash-0.26/t/02-extension.t
---- Package-Stash-0.26/t/02-extension.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/02-extension.t	2011-03-05 10:03:21.031145231 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 15;
- use Test::Fatal;
- 
- {
-@@ -72,5 +72,3 @@ is(exception {
- }, undef, '... created %Foo::baz successfully');
- 
- ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
--
--done_testing;
-diff -up Package-Stash-0.26/t/03-io.t.orig Package-Stash-0.26/t/03-io.t
---- Package-Stash-0.26/t/03-io.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/03-io.t	2011-03-05 10:03:21.032145386 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 11;
- use Test::Fatal;
- 
- {
-@@ -47,5 +47,3 @@ use Package::Stash;
-     ok($stash->has_symbol('baz'), "has baz");
-     is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz");
- }
--
--done_testing;
-diff -up Package-Stash-0.26/t/04-get.t.orig Package-Stash-0.26/t/04-get.t
---- Package-Stash-0.26/t/04-get.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/04-get.t	2011-03-05 10:03:21.033145540 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 36;
- 
- use Package::Stash;
- use Scalar::Util;
-@@ -182,5 +182,3 @@ use Scalar::Util;
-              "stash has the right variable");
-     }
- }
--
--done_testing;
-diff -up Package-Stash-0.26/t/05-isa.t.orig Package-Stash-0.26/t/05-isa.t
---- Package-Stash-0.26/t/05-isa.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/05-isa.t	2011-03-05 10:03:21.033145540 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 1;
- 
- use Package::Stash;
- 
-@@ -17,6 +17,7 @@ use Package::Stash;
- my $stash = Package::Stash->new('Foo');
- my @ISA = ('Bar');
- @{$stash->get_or_add_symbol('@ISA')} = @ISA;
-+SKIP: {
-+skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
- isa_ok('Foo', 'Bar');
--
--done_testing;
-+}
-diff -up Package-Stash-0.26/t/06-addsub.t.orig Package-Stash-0.26/t/06-addsub.t
---- Package-Stash-0.26/t/06-addsub.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/06-addsub.t	2011-03-05 10:03:21.034145695 +0000
+diff -up Package-Stash-0.31/t/addsub.t.orig Package-Stash-0.31/t/addsub.t
+--- Package-Stash-0.31/t/addsub.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/addsub.t	2011-08-09 09:41:59.191745893 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -110,45 +16,9 @@ diff -up Package-Stash-0.26/t/06-addsub.t.orig Package-Stash-0.26/t/06-addsub.t
      '... got the right %DB::sub value for dunk with specified args';
 -
 -done_testing;
-diff -up Package-Stash-0.26/t/07-edge-cases.t.orig Package-Stash-0.26/t/07-edge-cases.t
---- Package-Stash-0.26/t/07-edge-cases.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/07-edge-cases.t	2011-03-05 10:03:44.932845747 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 16;
- use Test::Fatal;
- 
- use Package::Stash;
-@@ -80,5 +80,3 @@ use_ok('CompileTime');
-     }
-     ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted");
- }
--
--done_testing;
-diff -up Package-Stash-0.26/t/10-synopsis.t.orig Package-Stash-0.26/t/10-synopsis.t
---- Package-Stash-0.26/t/10-synopsis.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/10-synopsis.t	2011-03-05 10:03:21.035145851 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 3;
- 
- use Package::Stash;
- 
-@@ -15,5 +15,3 @@ $stash->add_symbol('%foo', {bar => 1});
- ok(!$stash->has_symbol('$foo'), "doesn't have anything in scalar slot");
- my $namespace = $stash->namespace;
- is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
--
--done_testing;
-diff -up Package-Stash-0.26/t/author-20-leaks.t.orig Package-Stash-0.26/t/author-20-leaks.t
---- Package-Stash-0.26/t/author-20-leaks.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/author-20-leaks.t	2011-03-05 10:03:21.060149721 +0000
+diff -up Package-Stash-0.31/t/author-20-leaks.t.orig Package-Stash-0.31/t/author-20-leaks.t
+--- Package-Stash-0.31/t/author-20-leaks.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/author-20-leaks.t	2011-08-09 09:41:59.214745838 +0100
 @@ -14,6 +14,8 @@ use Test::More;
  use Test::Fatal;
  use Test::LeakTrace;
@@ -175,9 +45,9 @@ diff -up Package-Stash-0.26/t/author-20-leaks.t.orig Package-Stash-0.26/t/author
  }
 -
 -done_testing;
-diff -up Package-Stash-0.26/t/author-21-leaks-debug.t.orig Package-Stash-0.26/t/author-21-leaks-debug.t
---- Package-Stash-0.26/t/author-21-leaks-debug.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/author-21-leaks-debug.t	2011-03-05 10:03:21.060149721 +0000
+diff -up Package-Stash-0.31/t/author-21-leaks-debug.t.orig Package-Stash-0.31/t/author-21-leaks-debug.t
+--- Package-Stash-0.31/t/author-21-leaks-debug.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/author-21-leaks-debug.t	2011-08-09 09:41:59.215745836 +0100
 @@ -14,6 +14,8 @@ use Test::More;
  use Test::Fatal;
  use Test::LeakTrace;
@@ -204,63 +74,94 @@ diff -up Package-Stash-0.26/t/author-21-leaks-debug.t.orig Package-Stash-0.26/t/
  }
 -
 -done_testing;
-diff -up Package-Stash-0.26/t/impl-selection/01-choice.t.orig Package-Stash-0.26/t/impl-selection/01-choice.t
---- Package-Stash-0.26/t/impl-selection/01-choice.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/impl-selection/01-choice.t	2011-03-05 10:03:21.036146006 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
+diff -up Package-Stash-0.31/t/basic.t.orig Package-Stash-0.31/t/basic.t
+--- Package-Stash-0.31/t/basic.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/basic.t	2011-08-09 09:41:59.215745836 +0100
+@@ -2,7 +2,7 @@
  use strict;
  use warnings;
+ use lib 't/lib';
 -use Test::More;
-+use Test::More tests => 2;
++use Test::More tests => 122;
+ use Test::Fatal;
  
- my $has_xs = eval "require Package::Stash::XS; 1";
- 
-@@ -13,5 +13,3 @@ my $expected = $has_xs ? 'XS' : 'PP';
- is($Package::Stash::IMPLEMENTATION, $expected,
-    "autodetected properly: $expected");
- can_ok('Package::Stash', 'new');
--
--done_testing;
-diff -up Package-Stash-0.26/t/impl-selection/02-env.t.orig Package-Stash-0.26/t/impl-selection/02-env.t
---- Package-Stash-0.26/t/impl-selection/02-env.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/impl-selection/02-env.t	2011-03-05 10:03:21.037146160 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 4;
- 
- # XXX: work around dumb core segfault bug when you delete stashes
- sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
-@@ -25,5 +25,3 @@ SKIP: {
-     is(get_impl, 'XS', "autodetected properly: XS");
-     can_ok('Package::Stash', 'new');
+ use Package::Stash;
+@@ -416,5 +416,3 @@ like(exception {
+         "list_all_symbols CODE",
+     );
  }
 -
 -done_testing;
-diff -up Package-Stash-0.26/t/impl-selection/03-var.t.orig Package-Stash-0.26/t/impl-selection/03-var.t
---- Package-Stash-0.26/t/impl-selection/03-var.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/impl-selection/03-var.t	2011-03-05 10:03:21.037146160 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
+diff -up Package-Stash-0.31/t/compile-time.t.orig Package-Stash-0.31/t/compile-time.t
+--- Package-Stash-0.31/t/compile-time.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/compile-time.t	2011-08-09 09:42:22.757688109 +0100
+@@ -2,8 +2,6 @@
  use strict;
  use warnings;
+ use lib 't/lib';
 -use Test::More;
-+use Test::More tests => 4;
++use Test::More tests => 1;
  
- # XXX: work around dumb core segfault bug when you delete stashes
- sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
-@@ -25,5 +25,3 @@ SKIP: {
-     is(get_impl, 'XS', "autodetected properly: XS");
-     can_ok('Package::Stash', 'new');
+ use_ok('CompileTime');
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/edge-cases.t.orig Package-Stash-0.31/t/edge-cases.t
+--- Package-Stash-0.31/t/edge-cases.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/edge-cases.t	2011-08-09 09:41:59.215745836 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 11;
+ use Test::Fatal;
+ 
+ use Package::Stash;
+@@ -52,5 +52,3 @@ is(ref($constant), 'CODE', "expanded a c
+ # was here)
+ is(ref($stash->get_symbol('$glob')), '', "nothing yet");
+ is(ref($stash->get_or_add_symbol('$glob')), 'SCALAR', "got an empty scalar");
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/extension.t.orig Package-Stash-0.31/t/extension.t
+--- Package-Stash-0.31/t/extension.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/extension.t	2011-08-09 09:41:59.216745833 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 15;
+ use Test::Fatal;
+ 
+ {
+@@ -72,5 +72,3 @@ is(exception {
+ }, undef, '... created %Foo::baz successfully');
+ 
+ ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/get.t.orig Package-Stash-0.31/t/get.t
+--- Package-Stash-0.31/t/get.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/get.t	2011-08-09 09:41:59.216745833 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 36;
+ 
+ use Package::Stash;
+ use Scalar::Util;
+@@ -182,5 +182,3 @@ use Scalar::Util;
+              "stash has the right variable");
+     }
  }
 -
 -done_testing;
-diff -up Package-Stash-0.26/t/impl-selection/10-basic-pp.t.orig Package-Stash-0.26/t/impl-selection/10-basic-pp.t
---- Package-Stash-0.26/t/impl-selection/10-basic-pp.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/impl-selection/10-basic-pp.t	2011-03-05 10:03:21.048147863 +0000
+diff -up Package-Stash-0.31/t/impl-selection/basic-pp.t.orig Package-Stash-0.31/t/impl-selection/basic-pp.t
+--- Package-Stash-0.31/t/impl-selection/basic-pp.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/impl-selection/basic-pp.t	2011-08-09 09:41:59.216745833 +0100
 @@ -1,7 +1,7 @@
  #!/usr/bin/env perl
  use strict;
@@ -276,9 +177,9 @@ diff -up Package-Stash-0.26/t/impl-selection/10-basic-pp.t.orig Package-Stash-0.
  }
 -
 -done_testing;
-diff -up Package-Stash-0.26/t/impl-selection/11-basic-xs.t.orig Package-Stash-0.26/t/impl-selection/11-basic-xs.t
---- Package-Stash-0.26/t/impl-selection/11-basic-xs.t.orig	2011-03-04 19:14:05.000000000 +0000
-+++ Package-Stash-0.26/t/impl-selection/11-basic-xs.t	2011-03-05 10:03:21.056149102 +0000
+diff -up Package-Stash-0.31/t/impl-selection/basic-xs.t.orig Package-Stash-0.31/t/impl-selection/basic-xs.t
+--- Package-Stash-0.31/t/impl-selection/basic-xs.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/impl-selection/basic-xs.t	2011-08-09 09:41:59.216745833 +0100
 @@ -1,7 +1,7 @@
  #!/usr/bin/env perl
  use strict;
@@ -294,3 +195,151 @@ diff -up Package-Stash-0.26/t/impl-selection/11-basic-xs.t.orig Package-Stash-0.
  }
 -
 -done_testing;
+diff -up Package-Stash-0.31/t/impl-selection/choice.t.orig Package-Stash-0.31/t/impl-selection/choice.t
+--- Package-Stash-0.31/t/impl-selection/choice.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/impl-selection/choice.t	2011-08-09 09:41:59.217745830 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 2;
+ 
+ my $has_xs = eval "require Package::Stash::XS; 1";
+ 
+@@ -13,5 +13,3 @@ my $expected = $has_xs ? 'XS' : 'PP';
+ is($Package::Stash::IMPLEMENTATION, $expected,
+    "autodetected properly: $expected");
+ can_ok('Package::Stash', 'new');
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/impl-selection/env.t.orig Package-Stash-0.31/t/impl-selection/env.t
+--- Package-Stash-0.31/t/impl-selection/env.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/impl-selection/env.t	2011-08-09 09:41:59.217745830 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 4;
+ 
+ # XXX: work around dumb core segfault bug when you delete stashes
+ sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
+@@ -25,5 +25,3 @@ SKIP: {
+     is(get_impl, 'XS', "autodetected properly: XS");
+     can_ok('Package::Stash', 'new');
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/impl-selection/var.t.orig Package-Stash-0.31/t/impl-selection/var.t
+--- Package-Stash-0.31/t/impl-selection/var.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/impl-selection/var.t	2011-08-09 09:41:59.217745830 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 4;
+ 
+ # XXX: work around dumb core segfault bug when you delete stashes
+ sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
+@@ -25,5 +25,3 @@ SKIP: {
+     is(get_impl, 'XS', "autodetected properly: XS");
+     can_ok('Package::Stash', 'new');
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/io.t.orig Package-Stash-0.31/t/io.t
+--- Package-Stash-0.31/t/io.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/io.t	2011-08-09 09:41:59.217745830 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 11;
+ use Test::Fatal;
+ 
+ {
+@@ -47,5 +47,3 @@ use Package::Stash;
+     ok($stash->has_symbol('baz'), "has baz");
+     is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz");
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/isa.t.orig Package-Stash-0.31/t/isa.t
+--- Package-Stash-0.31/t/isa.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/isa.t	2011-08-09 09:41:59.218745827 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 1;
+ 
+ use Package::Stash;
+ 
+@@ -17,6 +17,7 @@ use Package::Stash;
+ my $stash = Package::Stash->new('Foo');
+ my @ISA = ('Bar');
+ @{$stash->get_or_add_symbol('@ISA')} = @ISA;
++SKIP: {
++skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
+ isa_ok('Foo', 'Bar');
+-
+-done_testing;
++}
+diff -up Package-Stash-0.31/t/scalar-values.t.orig Package-Stash-0.31/t/scalar-values.t
+--- Package-Stash-0.31/t/scalar-values.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/scalar-values.t	2011-08-09 09:42:51.692617168 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 14;
+ use Test::Fatal;
+ 
+ use B;
+@@ -49,5 +49,3 @@ my $vstring = v1.2.3;
+ is(reftype(\$vstring), ($] < 5.010 ? 'SCALAR' : 'VSTRING'));
+ is(exception { $Bar->add_symbol('$vstring', \$vstring) }, undef,
+    "can add vstring values");
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/stash-deletion.t.orig Package-Stash-0.31/t/stash-deletion.t
+--- Package-Stash-0.31/t/stash-deletion.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/stash-deletion.t	2011-08-09 09:43:10.964569928 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 2;
+ 
+ use Package::Stash;
+ 
+@@ -20,5 +20,3 @@ use Package::Stash;
+     }
+     ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted");
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.31/t/synopsis.t.orig Package-Stash-0.31/t/synopsis.t
+--- Package-Stash-0.31/t/synopsis.t.orig	2011-08-08 16:43:29.000000000 +0100
++++ Package-Stash-0.31/t/synopsis.t	2011-08-09 09:41:59.218745827 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 3;
+ 
+ use Package::Stash;
+ 
+@@ -15,5 +15,3 @@ $stash->add_symbol('%foo', {bar => 1});
+ ok(!$stash->has_symbol('$foo'), "doesn't have anything in scalar slot");
+ my $namespace = $stash->namespace;
+ is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
+-
+-done_testing;
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 71b62b4..1770d7a 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -5,16 +5,16 @@
 %global old_eumm %(perl -MExtUtils::MakeMaker -e 'printf "%d\\n", $ExtUtils::MakeMaker::VERSION < 6.30 ? 1 : 0;' 2>/dev/null || echo 0)
 
 Name:		perl-Package-Stash
-Version:	0.30
-Release:	2%{?dist}
+Version:	0.31
+Release:	1%{?dist}
 Summary:	Routines for manipulating stashes
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Package-Stash/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-%{version}.tar.gz
 Patch0:		Package-Stash-0.30-EU::MM-version.patch
-Patch1:		Package-Stash-0.26-old-Test::More.patch
-Patch2:		Package-Stash-0.23-no-Test::Requires.patch
+Patch1:		Package-Stash-0.31-old-Test::More.patch
+Patch2:		Package-Stash-0.31-no-Test::Requires.patch
 Patch3:		Package-Stash-0.25-no-Test::LeakTrace.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
@@ -99,6 +99,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash::PP.3pm*
 
 %changelog
+* Tue Aug  9 2011 Paul Howarth <paul@city-fan.org> - 0.31-1
+- Update to 0.31
+  - Fix ->add_symbol('$foo', qr/sdlfk/) on 5.12+
+  - Fix ->add_symbol('$foo', \v1.2.3) on 5.10+
+- Update patch for old Test::More versions
+- Update patch for no Test::Requires
+
 * Thu Jul 21 2011 Paul Howarth <paul@city-fan.org> - 0.30-2
 - Perl mass rebuild
 
diff --git a/sources b/sources
index 3ef9ee4..2dc2a7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15877ab44448d85ce36418a7d3b8a5af  Package-Stash-0.30.tar.gz
+5fa2b3318c9c9db1188330db2a3f8a19  Package-Stash-0.31.tar.gz