harden method signatures
fix failing test
Merge pull request #3233 from dereuromark/3.0-method-signature

WIP - 3.0 method signature