Added response class
changes and cleanup
test