cleanup of response module + test coverage