FIX counter + tests for triggers