Fix up broken tests, fix the escape check and skolem escape check.