Fixes some tests.
Fixes helper.
Fixes tests.