rename test and remove watermark support