Removing another reference to Moq
Fixing naming inconsistencies and removing generics