Added ActivationKeyContentOverrideCuratorTest and cleanup