move tests into helpers base dir
merging Ben's code