removed redundant helper, fixed test