Remove Addons, update tests