Refactor and fix broken asset response tests
Refactor and fix broken batch response tests