Fixed issues with pull request.
Re-added if null check - removed by mistake.
Added test to check this code.
Removed Service in Tests.csproj