PR feedback

Addressing some PR feedback + offline discussion comments from Chris.

Also added a test for the NoopTrigger.