Rename vars in delegate_method to match terminology in docs
Improve certain names of tests for delegate_method