changes for variants; fix tests (types)