added capture-avoiding substitution tests