variant store tests, var renaming, and normalizing variant