fixing more of the extension references and tests