ParseAnnotations, validAnnotations, Tests added