Swirling is quite effective...maybe next time you use the calibration fluid try one test before you shake, then one after shaking, see the results.
I do mix the quantity again I need for the water change when bring it to temp but when I've tested the standing salt water it was the same salinity.
I'll give it a try.