Add tests for helper class