diff --git a/src/bin/cxx/image_blend_border.cc b/src/bin/cxx/image_blend_border.cc
index fe11d8c..a9f63b4 100644
--- a/src/bin/cxx/image_blend_border.cc
+++ b/src/bin/cxx/image_blend_border.cc
@@ -31,6 +31,14 @@ static void _setup()
    for (i = 0; i < OBNUM; i++)
      {
         evas::image o(efl::eo::parent = *canvas);
+        /// XXX
+        if(!::eo_composite_is(o._eo_ptr()))
+          {
+             std::cout << "<< >> " << __FUNCTION__ << "() +" << __LINE__ 
+                       << " XXX " << std::endl;
+             abort();
+          }
+        /// XXX
         images.push_back(o);
         o.file_set(::build_path("bar.png"), ""); // XXX
         o.border_set(6, 6, 6, 6);
diff --git a/src/bin/tests.h b/src/bin/tests.h
index b293486..bbc5929 100644
--- a/src/bin/tests.h
+++ b/src/bin/tests.h
@@ -7,130 +7,130 @@ extern "C" {
 #include "cxx/image_blend_border_cxx.c"
 
 // C tests
-#include "widgets_file_icons.c"
-#include "widgets_file_icons_2.c"
-#include "widgets_file_icons_2_grouped.c"
-#include "widgets_file_icons_2_same.c"
-#include "widgets_file_icons_2_same_grouped.c"
-#include "widgets_file_icons_3.c"
-#include "widgets_file_icons_4.c"
-#include "widgets_list_1.c"
-#include "widgets_list_1_grouped.c"
-#include "widgets_list_2.c"
-#include "widgets_list_2_grouped.c"
-#include "widgets_list_3.c"
-#include "widgets_list_3_grouped.c"
-#include "widgets_list_4.c"
-#include "widgets_list_4_grouped.c"
-#include "image_blend_unscaled.c"
-#include "image_blend_solid_middle_unscaled.c"
-#include "image_blend_fade_unscaled.c"
-#include "image_blend_fade_pow2_unscaled.c"
-#include "image_blend_solid_unscaled.c"
-#include "image_blend_solid_fade_unscaled.c"
-#include "image_blend_solid_fade_pow2_unscaled.c"
-#include "image_blend_nearest_scaled.c"
-#include "image_blend_nearest_solid_scaled.c"
-#include "image_blend_smooth_scaled.c"
-#include "image_blend_smooth_solid_scaled.c"
-#include "image_blend_nearest_same_scaled.c"
-#include "image_blend_nearest_solid_same_scaled.c"
-#include "image_blend_smooth_same_scaled.c"
-#include "image_blend_smooth_solid_same_scaled.c"
+/* #include "widgets_file_icons.c" */
+/* #include "widgets_file_icons_2.c" */
+/* #include "widgets_file_icons_2_grouped.c" */
+/* #include "widgets_file_icons_2_same.c" */
+/* #include "widgets_file_icons_2_same_grouped.c" */
+/* #include "widgets_file_icons_3.c" */
+/* #include "widgets_file_icons_4.c" */
+/* #include "widgets_list_1.c" */
+/* #include "widgets_list_1_grouped.c" */
+/* #include "widgets_list_2.c" */
+/* #include "widgets_list_2_grouped.c" */
+/* #include "widgets_list_3.c" */
+/* #include "widgets_list_3_grouped.c" */
+/* #include "widgets_list_4.c" */
+/* #include "widgets_list_4_grouped.c" */
+/* #include "image_blend_unscaled.c" */
+/* #include "image_blend_solid_middle_unscaled.c" */
+/* #include "image_blend_fade_unscaled.c" */
+/* #include "image_blend_fade_pow2_unscaled.c" */
+/* #include "image_blend_solid_unscaled.c" */
+/* #include "image_blend_solid_fade_unscaled.c" */
+/* #include "image_blend_solid_fade_pow2_unscaled.c" */
+/* #include "image_blend_nearest_scaled.c" */
+/* #include "image_blend_nearest_solid_scaled.c" */
+/* #include "image_blend_smooth_scaled.c" */
+/* #include "image_blend_smooth_solid_scaled.c" */
+/* #include "image_blend_nearest_same_scaled.c" */
+/* #include "image_blend_nearest_solid_same_scaled.c" */
+/* #include "image_blend_smooth_same_scaled.c" */
+/* #include "image_blend_smooth_solid_same_scaled.c" */
 #include "image_blend_border.c"
-#include "image_blend_solid_middle_border.c"
-#include "image_blend_solid_border.c"
-#include "image_blend_border_recolor.c"
-#include "image_map_rotate.c"
-#include "image_map_solid_rotate.c"
-#include "image_map_nearest_rotate.c"
-#include "image_map_nearest_solid_rotate.c"
-#include "image_map_color_rotate.c"
-#include "image_map_color_solid_rotate.c"
-#include "image_map_color_nearest_rotate.c"
-#include "image_map_color_nearest_solid_rotate.c"
-#include "image_map_color_alpha_rotate.c"
-#include "image_map_color_alpha_solid_rotate.c"
-#include "image_map_color_alpha_nearest_rotate.c"
-#include "image_map_color_alpha_nearest_solid_rotate.c"
-#include "image_map_3d_1.c"
-#include "image_map_3d_2.c"
-#include "image_map_3d_3.c"
-#include "image_map_3d_4.c"
-#include "image_map_3d_5.c"
-#include "image_map_3d_6.c"
-#include "image_map_3d_flow.c"
-#include "image_quality_scale.c"
-#include "image_data_argb.c"
-#include "image_data_argb_alpha.c"
-#include "image_data_ycbcr601pl.c"
-#include "image_data_ycbcr601pl_wide_stride.c"
-#include "image_data_ycbcr601pl_map_solid_rotate.c"
-#include "image_data_ycbcr601pl_map_nearest_solid_rotate.c"
-#include "image_crossfade.c"
-#include "text_basic.c"
-#include "text_styles.c"
-#include "text_styles_different_strings.c"
-#include "text_change.c"
-#include "textblock_basic.c"
-#include "textblock_intl.c"
-#include "textblock_auto_align.c"
-#include "textblock_text_append.c"
-#include "rect_blend.c"
-#include "rect_blend_pow2.c"
-#include "rect_solid.c"
-#include "rect_blend_few.c"
-#include "rect_blend_pow2_few.c"
-#include "rect_solid_few.c"
-#include "image_blend_occlude1_few.c"
-#include "image_blend_occlude2_few.c"
-#include "image_blend_occlude3_few.c"
-#include "image_blend_occlude1.c"
-#include "image_blend_occlude2.c"
-#include "image_blend_occlude3.c"
-#include "image_blend_occlude1_many.c"
-#include "image_blend_occlude2_many.c"
-#include "image_blend_occlude3_many.c"
-#include "image_blend_occlude1_very_many.c"
-#include "image_blend_occlude2_very_many.c"
-#include "image_blend_occlude3_very_many.c"
-#include "poly_blend.c"
-#include "proxy_image.c"
-#include "proxy_text_fixed.c"
-#include "proxy_text_random.c"
-#include "line_blend.c"
-#include "image_blend_many_smooth_same_scaled.c"
-#include "font_effect_blur_alpha.c"
-#include "font_effect_blur_color.c"
-#if 0 // test disabled - evas having code disabled
-#include "image_mask.c"
-#include "image_mask_2.c"
-#include "image_mask_3.c"
-#include "image_mask_4.c"
-#include "image_mask_5.c"
-#include "image_mask_6.c"
-#include "image_mask_7.c"
-#include "image_mask_8.c"
-#include "image_mask_9.c"
-#include "image_mask_10.c"
-#include "image_mask_11.c"
-#include "image_mask_12.c"
-#include "image_mask_13.c"
-#include "image_mask_14.c"
-#include "image_mask_15.c"
-#include "filter_object_colors.c"
-#include "filter_object_colors_solid.c"
-#include "filter_object_invert.c"
-#include "filter_object_invert_solid.c"
-#include "filter_object_greyscale.c"
-#include "filter_object_greyscale_solid.c"
-#include "filter_object_brightness.c"
-#include "filter_object_brightness_solid.c"
-#include "filter_object_sepia.c"
-#include "filter_object_sepia_solid.c"
-#include "filter_object_blur.c"
-#include "filter_object_blur_solid.c"
-#endif
+/* #include "image_blend_solid_middle_border.c" */
+/* #include "image_blend_solid_border.c" */
+/* #include "image_blend_border_recolor.c" */
+/* #include "image_map_rotate.c" */
+/* #include "image_map_solid_rotate.c" */
+/* #include "image_map_nearest_rotate.c" */
+/* #include "image_map_nearest_solid_rotate.c" */
+/* #include "image_map_color_rotate.c" */
+/* #include "image_map_color_solid_rotate.c" */
+/* #include "image_map_color_nearest_rotate.c" */
+/* #include "image_map_color_nearest_solid_rotate.c" */
+/* #include "image_map_color_alpha_rotate.c" */
+/* #include "image_map_color_alpha_solid_rotate.c" */
+/* #include "image_map_color_alpha_nearest_rotate.c" */
+/* #include "image_map_color_alpha_nearest_solid_rotate.c" */
+/* #include "image_map_3d_1.c" */
+/* #include "image_map_3d_2.c" */
+/* #include "image_map_3d_3.c" */
+/* #include "image_map_3d_4.c" */
+/* #include "image_map_3d_5.c" */
+/* #include "image_map_3d_6.c" */
+/* #include "image_map_3d_flow.c" */
+/* #include "image_quality_scale.c" */
+/* #include "image_data_argb.c" */
+/* #include "image_data_argb_alpha.c" */
+/* #include "image_data_ycbcr601pl.c" */
+/* #include "image_data_ycbcr601pl_wide_stride.c" */
+/* #include "image_data_ycbcr601pl_map_solid_rotate.c" */
+/* #include "image_data_ycbcr601pl_map_nearest_solid_rotate.c" */
+/* #include "image_crossfade.c" */
+/* #include "text_basic.c" */
+/* #include "text_styles.c" */
+/* #include "text_styles_different_strings.c" */
+/* #include "text_change.c" */
+/* #include "textblock_basic.c" */
+/* #include "textblock_intl.c" */
+/* #include "textblock_auto_align.c" */
+/* #include "textblock_text_append.c" */
+/* #include "rect_blend.c" */
+/* #include "rect_blend_pow2.c" */
+/* #include "rect_solid.c" */
+/* #include "rect_blend_few.c" */
+/* #include "rect_blend_pow2_few.c" */
+/* #include "rect_solid_few.c" */
+/* #include "image_blend_occlude1_few.c" */
+/* #include "image_blend_occlude2_few.c" */
+/* #include "image_blend_occlude3_few.c" */
+/* #include "image_blend_occlude1.c" */
+/* #include "image_blend_occlude2.c" */
+/* #include "image_blend_occlude3.c" */
+/* #include "image_blend_occlude1_many.c" */
+/* #include "image_blend_occlude2_many.c" */
+/* #include "image_blend_occlude3_many.c" */
+/* #include "image_blend_occlude1_very_many.c" */
+/* #include "image_blend_occlude2_very_many.c" */
+/* #include "image_blend_occlude3_very_many.c" */
+/* #include "poly_blend.c" */
+/* #include "proxy_image.c" */
+/* #include "proxy_text_fixed.c" */
+/* #include "proxy_text_random.c" */
+/* #include "line_blend.c" */
+/* #include "image_blend_many_smooth_same_scaled.c" */
+/* #include "font_effect_blur_alpha.c" */
+/* #include "font_effect_blur_color.c" */
+/* #if 0 // test disabled - evas having code disabled */
+/* #include "image_mask.c" */
+/* #include "image_mask_2.c" */
+/* #include "image_mask_3.c" */
+/* #include "image_mask_4.c" */
+/* #include "image_mask_5.c" */
+/* #include "image_mask_6.c" */
+/* #include "image_mask_7.c" */
+/* #include "image_mask_8.c" */
+/* #include "image_mask_9.c" */
+/* #include "image_mask_10.c" */
+/* #include "image_mask_11.c" */
+/* #include "image_mask_12.c" */
+/* #include "image_mask_13.c" */
+/* #include "image_mask_14.c" */
+/* #include "image_mask_15.c" */
+/* #include "filter_object_colors.c" */
+/* #include "filter_object_colors_solid.c" */
+/* #include "filter_object_invert.c" */
+/* #include "filter_object_invert_solid.c" */
+/* #include "filter_object_greyscale.c" */
+/* #include "filter_object_greyscale_solid.c" */
+/* #include "filter_object_brightness.c" */
+/* #include "filter_object_brightness_solid.c" */
+/* #include "filter_object_sepia.c" */
+/* #include "filter_object_sepia_solid.c" */
+/* #include "filter_object_blur.c" */
+/* #include "filter_object_blur_solid.c" */
+/* #endif */
 
 #ifdef __cplusplus
 }