Fixes nulls and not adding helper method data to set
Adds basic tests for helper methods