upgrade escapist, mock out and document options passing