Again, before the value tests.  Likewise in tests below.