Add BuffActivator and update tests