Fixed tests around escape