Added tests, renamed classes, added some new stuff
Added Response