Mock trigger fixes

[msmannan00]

Before you submit a pull request, please make sure:

• [ ] The pull request should include a description of the problem you're trying to solve
• [ ] The pull request should include overview of the suggested solution
• [ ] If the pull requests changes current behavior, reasons why your solution is better.
• [ ] The proposed code should be fully functional
• [ ] The proposed code should contain tests relevant to prove is functionality
• [ ] The proposed tests should ensure significative code coverage
• [ ] All new and existing tests should pass

[evilaliv3]

Good to go! Thank you @msmannan00