Updates from newInterface, mostly Key Discovery and tests