bit more testing
Resharper code cleanup