Refactored Response classes + some more tests