CDB-1306 Removal of test variable placeholders, cannot test more for the moment but seems to be all ok.