Fix test and added helper test