Added some tests
Added CompositeTrigger