I pretty much always get a suite whenever I'm staying just for one night at a FS Marriott. I never got upgraded when staying for more than one night.

I've never tried this, but maybe I should make a reservation for one night and if upgraded, extend the reservation after checking in...