Add missing method check.
Fix tests.