Code Review: Swap ordering of watermark getting.

A test for Julius.