Complete exercises

* Update integration test
* Update helper test