Minor changes regaring sorting of use
Adding Mockery to UnitTests