* error fixed

* rename

* solve conlicts with master

* more test added

* fix error

* remove test

* comment addressed