Refactored & added response parsing tests