Fix tests and add one on sub_request