Tp apply arguments

Also updated tests