fix tests (and remove one that didn't actually test upgrading)