Fix, refactoring and more tests.
ReSharper - code cleanup