Test refactor
Update tests for multi-method feature to use new format.