Add test + code for default trigger handling