Ported variant tests to the new testing framework.

12 files changed