Updated tests and code for extending results, taking into account variant witnesses.