Refactoring testing method calls.
Context menu correction.