Handle variant element names, merge in wildcard class, add test cases.