Cleaning up test and stream response

Closes #608