chore: update Makefile
refactor: aggregate triggers by protocol only
test: update tests