Refactoring

Remove abundant class. Make `response` instance variable
Testing for proper headers