Added the Test and Debug client variants.