Bug 20204: Add TestBuilder to replace CPL branch