Start adding testing for helpers