Microsoft gave you your option: Test Mode. You know, the thing you said you didn't like because of the watermarks. Use it or stfu
The option to disable them via command line basically negates them completely since any installer could disable it permanently, and it makes sense to remove that.