Issue #420 - Add tests for helper methods.
Issue #420 - Avoid duplicate params