Refactoring and fixes on Repos queries n Test Cases for Maintenance Spend by Suppliers

Refactoring and fixes on Repos queries n Test Cases for Maintenance Spend by Suppliers