Fix up mdtags in tests and test actual variant

This fixes some tests that had an incorrect mdTag and now we actually check the variant in the tests.