Simplify make_method and add tests for it