Merge "Fix H404/405 violations for api tests(2/3)"