Fix the activation test and storage type.