fix unit tests to correspond changes / add triggeredbybrid