Added Moq and refactored some things.