Updating wrong uniq value in tests
Fixed wrong tvar names