Refactored Request classes and added some tests
Wording changed in some tests