Move testing logic from command to editpolicy for SAnnotation annotation