fix helper helper setup and tests