Refactored trigger tests