Fixing watermark config and adding test.