Refactoring Request class to store token instead tokenId and fixing
tests