Add tests for service, and using NSubstitute rather than FakeItEasy