Fix broken test, handle terminate on the REQUEST