Makes SIGTERM optional and polls before firing SIGKILL
Updates tests to check if we recv sigterm