Qunit update

Reissue of #3836 fixing all the things.

@jrgm - wanna run through this?