builders and tests for triggers v2 added