Merge "Change python test trigger to use integration trigger macros"