Migrating virtuoso tests to match upstream