Fixes many of the activation-keys tests