Added Moq to API.Tests
Refactoring