helpers. fix duplicate method sig
package update
fix tests
Merge branch 'develop'