Update ExtensionManager unit tests and small clean up