Fix various tests left over from the Kusner attempt