Simplify methods and harden their signature
fix test
Merge pull request #3292 from dereuromark/3.0-method-signatures

Simplify methods and harden their signature