harden method signatures
fix test
Merge pull request #3237 from dereuromark/3.0.wip-harden-method-signatures

3.0.wip harden method signatures