Ran Code cleanup.
Adding Moq.