Cleaned up json response and mock responses