Fix tests.
Merge branch 'helper_unit_test' into dev