Minor refactoring and removal of modifier support

Refactored getting the parameter name only once.
Used the containsAll method to reduce the number of paths to test.

Modifiers are ignored in the extra operations.  However, the final
modifier is explicitly added.
Added mock tests to improve coverage to 100%