Added watermark function + test