Improve Variant tests