Fix test-package-server tag

... and also make some fixes to the 'update package server data' test,
though it's possible that only the other change is strictly necessary