Fix test data
Make removal backwards compatible with v2
Make repsonse handling bit more flexible to work with both v2 and v3