US-China Tax Treaty for student or researcher

Apology in advance since my situation seems very complicated. 

 

I entered the U.S. in Aug 2012 from China as an F1 student for a master's degree and continued for PhD in Aug 2015 at University A. I got a paid job working as a researcher at university B in Aug 2018 using CPT (F1) and switched to H1b in Aug 2019. I also had compensation as a teaching assistant from University A before June 2019. I never stopped my student status at University A although I switched to H1b.  Am I eligible for US-China tax-treaty as a student, a researcher, neither, or both?

 

My wife entered U.S. in Sept 2014 as an F2 dependent. She changed to F1 in Aug 2017 and graduated in May 2019 from University A. She received compensation from both University A and Company C before graduation. She continued working at company C using OPT after graduation. Is she eligible for the US-China tax treaty as a student? If she is, does it apply during the OPT period as well?

 

Thank you so much!

 

Thank you so much!