Using Request and Response now
Started work on fixing the tests