Fix test and request class