Fixing those tests are probably a good idea, too.