helpers done but tests not work
Revert "helpers done but tests not work"

This reverts commit 45043cf9c6843de71815f7b2eccf2bd3f02e79da.
w