updated helpers and tests.