Removed pluggin, added test alerts