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