add: nunit test
Merge changes prevouse commit