Make use of test helper
Update the functional tests
Refactor stuff with help of test helper