CONN-491 Reorganized DirectTest