updated rule with a few changes and fixed mockito tests
Merge pull request #5 from jlkeiper/ojwanganto-REPORTS-72

REPORTS-72 - updated rule with a few changes and fixed mockito tests