Added trigger computed + tests