* Add fix

* Revert "Add fix"

This reverts commit 5c81fee5.

* Generate unique contract names for tests

* Fix test

* Implement comments

* Implement comments