Yes, your understanding is correct. It will be helpful for you to read through the 10 examples: https://www.irs.gov/individuals/international-taxpayers/alien-residency-examples . I deal with a large number of nonresident cases each year, and correct many of them as well.
