Adding unit tests for helpers