Updated proxy handler.
Refactored the test method by creating base classes.