Refactoring and added tests for simple method exclusion
Improved tests