Catch a few more places that methods have names

Plus more tests for it