Improved governing finding and refactored that code. Also added more complex test cases for governing finding.