reorganized tests following D3