Seems like a potentially confusing time for both you and your W. That's a lot of shared history together! At a quick glance, it does seem like there is some tentative testing behaviour going on. Good job for reinforcing it selectively! It does sound to me like something is going on chemistry wise between the two of you that is different lately. The question is (as always isn't it?): what does it all mean??
You're responding in a way that sounds balanced and you have both eyes open, so keep us posted!