Updates to the response classes based on testing