Correct bug with redundant g-value-unset. Some change to subtest.