Some refactoring
Removed duplicate DummyRequest classes