increase test coverage
refactored to include minor resharper improvements
minor resharper refactorings and updated readme