updated TEST/D3D and template