Fix specs broken by flawed master_variant factory.