Testing enhanced
Corrected Resharper warning
Corrected Code analysis requests