Started adding tests for helpers