Refactored solution

Merged some tests
Replaced dummy with Moq.Mock<T>
Renamed some tests to reflect what they're testing