Fixed helper and added helper tests