todo + fields rename in tests
resharper cleanup command