diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 04782ce916..e4ce60a3dd 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -45,14 +45,14 @@ static Eina_Bool _looped_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Desc
 static Eina_Bool
 _seek_vol(void *data)
 {
-   double len;
+   double len = 0;
    Eo *in = data;
-   Eo *out;
+   Eo *out = NULL;
 
-   eo_do(in, ecore_audio_obj_in_output_get(&out));
+   eo_do(in, out = ecore_audio_obj_in_output_get());
 
    eo_do(out, ecore_audio_obj_volume_set(0.4));
-   eo_do(in, ecore_audio_obj_in_seek(-0.3, SEEK_END, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(-0.3, SEEK_END));
    fail_if(len < 0);
 
    return EINA_FALSE;
@@ -61,14 +61,14 @@ _seek_vol(void *data)
 START_TEST(ecore_test_ecore_audio_obj_pulse)
 {
    Eo *in, *out;
-   Eina_Bool ret;
+   Eina_Bool ret = EINA_FALSE;
    Eina_Bool pulse_context_failed = EINA_FALSE;
 
    in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
    fail_if(!in);
 
    eo_do(in, ecore_audio_obj_name_set("modem.wav"));
-   eo_do(in, ecore_audio_obj_source_set(TESTS_SRC_DIR"/modem.wav", &ret));
+   eo_do(in, ret = ecore_audio_obj_source_set(TESTS_SRC_DIR"/modem.wav"));
    fail_if(!ret);
 
    out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
@@ -79,7 +79,7 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
    eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _finished_cb, NULL));
    eo_do(out, eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _failed_cb, &pulse_context_failed));
 
-   eo_do(out, ecore_audio_obj_out_input_attach(in, &ret));
+   eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
    fail_if(!ret);
 
    ecore_main_loop_begin();
@@ -112,7 +112,7 @@ START_TEST(ecore_test_ecore_audio_cleanup)
 {
    Eo *in, *out;
    int freq = 1000;
-   Eina_Bool ret;
+   Eina_Bool ret = EINA_FALSE;
 
    in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
    fail_if(!in);
@@ -121,12 +121,12 @@ START_TEST(ecore_test_ecore_audio_cleanup)
 
    out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
    fail_if(!out);
-   eo_do(out, ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_OGG, &ret));
+   eo_do(out, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_OGG));
    fail_if(!ret);
-   eo_do(out, ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.ogg", &ret));
+   eo_do(out, ret = ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.ogg"));
    fail_if(!ret);
 
-   eo_do(out, ecore_audio_obj_out_input_attach(in, &ret));
+   eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
    fail_if(!ret);
 
    ecore_idler_add(_idle_del, in);
@@ -150,69 +150,69 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
 
    eo_do(in, ecore_audio_obj_name_set("tone"));
 
-   eo_do(in, ecore_audio_obj_in_channels_get(&channel));
+   eo_do(in, channel = ecore_audio_obj_in_channels_get());
    fail_if(channel != 1);
-   eo_do(in, ecore_audio_obj_in_samplerate_get(&rate));
+   eo_do(in, rate = ecore_audio_obj_in_samplerate_get());
    fail_if(rate != 44100);
-   eo_do(in, ecore_audio_obj_in_length_get(&len));
+   eo_do(in, len = ecore_audio_obj_in_length_get());
    fail_if(len != 1);
 
    eo_do(in, ecore_audio_obj_in_length_set(2.5));
-   eo_do(in, ecore_audio_obj_in_length_get(&len));
+   eo_do(in, len = ecore_audio_obj_in_length_get());
    fail_if(len != 2.5);
 
    eo_do(in, ecore_audio_obj_in_looped_set(EINA_TRUE));
 
-   eo_do(in, ecore_audio_obj_in_remaining_get(&len));
+   eo_do(in, len = ecore_audio_obj_in_remaining_get());
    fail_if(len != 2.5);
 
-   eo_do(in, eo_key_data_get(ECORE_AUDIO_ATTR_TONE_FREQ, (void **)&freq));
+   eo_do(in, freq = (intptr_t) eo_key_data_get(ECORE_AUDIO_ATTR_TONE_FREQ));
    fail_if(freq != 1000);
 
    freq = 2000;
    eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq, NULL));
 
-   eo_do(in, eo_key_data_get(ECORE_AUDIO_ATTR_TONE_FREQ, (void **)&freq));
+   eo_do(in, freq = (intptr_t) eo_key_data_get(ECORE_AUDIO_ATTR_TONE_FREQ));
    fail_if(freq != 2000);
 
    eo_do(in, eo_key_data_set("foo", "bar", NULL));
-   eo_do(in, eo_key_data_get("foo", (void **)&tmp));
+   eo_do(in, tmp = eo_key_data_get("foo"));
    ck_assert_str_eq(tmp, "bar");
 
-   eo_do(in, ecore_audio_obj_in_seek(5.0, SEEK_SET, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(5.0, SEEK_SET));
    fail_if(len != -1);
 
-   eo_do(in, ecore_audio_obj_in_seek(1.0, 42, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(1.0, 42));
    fail_if(len != -1);
 
-   eo_do(in, ecore_audio_obj_in_seek(1.0, SEEK_SET, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(1.0, SEEK_SET));
    fail_if(len != 1.0);
 
-   eo_do(in, ecore_audio_obj_in_remaining_get(&len));
+   eo_do(in, len = ecore_audio_obj_in_remaining_get());
    fail_if(len != 1.5);
 
-   eo_do(in, ecore_audio_obj_in_seek(1.0, SEEK_CUR, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(1.0, SEEK_CUR));
    fail_if(len != 2.0);
 
-   eo_do(in, ecore_audio_obj_in_remaining_get(&len));
+   eo_do(in, len = ecore_audio_obj_in_remaining_get());
    fail_if(len != 0.5);
 
-   eo_do(in, ecore_audio_obj_in_seek(-1.0, SEEK_END, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(-1.0, SEEK_END));
    fail_if(len != 1.5);
 
-   eo_do(in, ecore_audio_obj_in_remaining_get(&len));
+   eo_do(in, len = ecore_audio_obj_in_remaining_get());
    fail_if(len != 1.0);
 
    out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
    fail_if(!out);
 
    eo_do(out, ecore_audio_obj_name_set("tmp.wav"));
-   eo_do(out, ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_WAV, &ret));
+   eo_do(out, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_WAV));
    fail_if(!ret);
-   eo_do(out, ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.wav", &ret));
+   eo_do(out, ret = ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.wav"));
    fail_if(!ret);
 
-   eo_do(out, ecore_audio_obj_out_input_attach(in, &ret));
+   eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
    fail_if(!ret);
 
    eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_LOOPED, _looped_cb, NULL));
@@ -240,70 +240,70 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
    in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
    fail_if(!in);
 
-   eo_do(in, ecore_audio_obj_format_get(&fmt));
+   eo_do(in, fmt = ecore_audio_obj_format_get());
    fail_if(fmt != ECORE_AUDIO_FORMAT_AUTO);
 
-   eo_do(in, ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_FLAC, &ret));
+   eo_do(in, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_FLAC));
    fail_if(!ret);
 
-   eo_do(in, ecore_audio_obj_format_get(&fmt));
+   eo_do(in, fmt = ecore_audio_obj_format_get());
    fail_if(fmt != ECORE_AUDIO_FORMAT_FLAC);
 
-   eo_do(in, ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_AUTO, &ret));
+   eo_do(in, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_AUTO));
    fail_if(!ret);
 
    eo_do(in, ecore_audio_obj_name_set("sms.ogg"));
-   eo_do(in, ecore_audio_obj_source_set(TESTS_SRC_DIR"/sms.ogg", &ret));
+   eo_do(in, ret = ecore_audio_obj_source_set(TESTS_SRC_DIR"/sms.ogg"));
    fail_if(!ret);
 
-   eo_do(in, ecore_audio_obj_source_get(&src));
+   eo_do(in, src = ecore_audio_obj_source_get());
    ck_assert_str_eq(src, TESTS_SRC_DIR"/sms.ogg");
 
-   eo_do(in, ecore_audio_obj_format_get(&fmt));
+   eo_do(in, fmt = ecore_audio_obj_format_get());
    fail_if(fmt != ECORE_AUDIO_FORMAT_OGG);
 
-   eo_do(in, ecore_audio_obj_in_channels_get(&channel));
+   eo_do(in, channel = ecore_audio_obj_in_channels_get());
    fail_if(channel != 2);
-   eo_do(in, ecore_audio_obj_in_samplerate_get(&rate));
+   eo_do(in, rate = ecore_audio_obj_in_samplerate_get());
    fail_if(rate != 44100);
-   eo_do(in, ecore_audio_obj_in_length_get(&len));
+   eo_do(in, len = ecore_audio_obj_in_length_get());
    fail_if(len == 0);
-   eo_do(in, ecore_audio_obj_in_remaining_get(&rem));
+   eo_do(in, rem = ecore_audio_obj_in_remaining_get());
    fail_if(len != rem);
 
-   eo_do(in, ecore_audio_obj_format_get(&fmt));
+   eo_do(in, fmt = ecore_audio_obj_format_get());
    fail_if(fmt != ECORE_AUDIO_FORMAT_OGG);
 
-   eo_do(in, ecore_audio_obj_in_seek(0.5, SEEK_SET, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(0.5, SEEK_SET));
    fail_if(len != 0.5);
 
-   eo_do(in, ecore_audio_obj_in_seek(0.5, SEEK_CUR, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(0.5, SEEK_CUR));
    fail_if(len != 1.0);
 
-   eo_do(in, ecore_audio_obj_in_seek(-1.0, SEEK_END, &len));
+   eo_do(in, len = ecore_audio_obj_in_seek(-1.0, SEEK_END));
    fail_if(fabs(rem - 1 - len) > 0.1);
 
    out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
    fail_if(!out);
 
    eo_do(out, ecore_audio_obj_name_set("tmp.wav"));
-   eo_do(out, ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_WAV, &ret));
+   eo_do(out, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_WAV));
    fail_if(!ret);
 
-   eo_do(out, ecore_audio_obj_format_get(&fmt));
+   eo_do(out, fmt = ecore_audio_obj_format_get());
    fail_if(fmt != ECORE_AUDIO_FORMAT_WAV);
 
 
 //   eo_do(out, ecore_audio_obj_source_set("/tmp/file/does/not/exist/hopefully.wav", &ret));
 //   fail_if(ret);
 
-   eo_do(out, ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.wav", &ret));
+   eo_do(out, ret = ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.wav"));
    fail_if(!ret);
 
-   eo_do(out, ecore_audio_obj_source_get(&src));
+   eo_do(out, src = ecore_audio_obj_source_get());
    ck_assert_str_eq(src, TESTS_BUILD_DIR"/tmp.wav");
 
-   eo_do(out, ecore_audio_obj_out_input_attach(in, &ret));
+   eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
    fail_if(!ret);
 
    eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _finished_cb, NULL));
@@ -332,47 +332,47 @@ START_TEST(ecore_test_ecore_audio_obj_in_out)
   fail_if(!in2);
   fail_if(!out);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_output_get(&out2)));
+  eo_do(in, out2 = ecore_audio_obj_in_output_get());
 
   fail_if(out2);
 
-  fail_if(!eo_do(out, ecore_audio_obj_out_inputs_get(&in3)));
+  eo_do(out, in3 = ecore_audio_obj_out_inputs_get());
 
   fail_if(eina_list_count(in3) != 0);
 
-  fail_if(!eo_do(out, ecore_audio_obj_out_input_attach(in, &attached)));
+  eo_do(out, attached = ecore_audio_obj_out_input_attach(in));
   fail_if(!attached);
 
-  fail_if(!eo_do(out, ecore_audio_obj_out_input_attach(in, &attached)));
+  eo_do(out, attached = ecore_audio_obj_out_input_attach(in));
   fail_if(attached);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_output_get(&out2)));
+  eo_do(in, out2 = ecore_audio_obj_in_output_get());
 
   fail_if(out2 != out);
 
-  fail_if(!eo_do(out, ecore_audio_obj_out_inputs_get(&in3)));
+  eo_do(out, in3 = ecore_audio_obj_out_inputs_get());
 
   fail_if(eina_list_count(in3) != 1);
   fail_if(eina_list_data_get(in3) != in);
 
-  fail_if(!eo_do(out, ecore_audio_obj_out_input_attach(in2, &attached)));
+  eo_do(out, attached = ecore_audio_obj_out_input_attach(in2));
   fail_if(!attached);
 
-  fail_if(!eo_do(out, ecore_audio_obj_out_inputs_get(&in3)));
+  eo_do(out, in3 = ecore_audio_obj_out_inputs_get());
 
   fail_if(eina_list_count(in3) != 2);
   fail_if(eina_list_data_get(in3) != in);
 
   eo_del(in2);
 
-  fail_if(!eo_do(out, ecore_audio_obj_out_inputs_get(&in3)));
+  eo_do(out, in3 = ecore_audio_obj_out_inputs_get());
 
   fail_if(eina_list_count(in3) != 1);
   fail_if(eina_list_data_get(in3) != in);
 
   eo_del(out);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_output_get(&out2)));
+  eo_do(in, out2 = ecore_audio_obj_in_output_get());
 
   fail_if(out2);
 
@@ -431,7 +431,7 @@ START_TEST(ecore_test_ecore_audio_obj_vio)
   eo_do(in, ecore_audio_obj_vio_set(&in_vio, NULL, NULL));
   eo_do(out, ecore_audio_obj_vio_set(&out_vio, NULL, NULL));
 
-  eo_do(out, ecore_audio_obj_out_input_attach(in, NULL));
+  eo_do(out, ecore_audio_obj_out_input_attach(in));
 
   ecore_main_loop_begin();
 
@@ -464,73 +464,73 @@ START_TEST(ecore_test_ecore_audio_obj_in)
 
   fail_if(!in);
 
-  fail_if(!eo_do(in, ecore_audio_obj_vio_set(&vio, &freed, _myfree)));
+  eo_do(in, ecore_audio_obj_vio_set(&vio, &freed, _myfree));
   fail_if(freed);
 
-  fail_if(!eo_do(in, ecore_audio_obj_vio_set(NULL, NULL, NULL)));
+  eo_do(in, ecore_audio_obj_vio_set(NULL, NULL, NULL));
   fail_if(!freed);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_speed_get(&speed)));
+  eo_do(in, speed = ecore_audio_obj_in_speed_get());
   fail_if(speed != 1.0);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_speed_set(2.5)));
+  eo_do(in, ecore_audio_obj_in_speed_set(2.5));
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_speed_get(&speed)));
+  eo_do(in, speed = ecore_audio_obj_in_speed_get());
   fail_if(speed != 2.5);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_speed_set(0)));
+  eo_do(in, ecore_audio_obj_in_speed_set(0));
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_speed_get(&speed)));
+  eo_do(in, speed = ecore_audio_obj_in_speed_get());
   fail_if(speed != 0.2);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_speed_set(10)));
+  eo_do(in, ecore_audio_obj_in_speed_set(10));
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_speed_get(&speed)));
+  eo_do(in, speed = ecore_audio_obj_in_speed_get());
   fail_if(speed != 5.0);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_samplerate_get(&samplerate)));
+  eo_do(in, samplerate = ecore_audio_obj_in_samplerate_get());
   fail_if(samplerate != 0);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_samplerate_set(1234)));
+  eo_do(in, ecore_audio_obj_in_samplerate_set(1234));
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_samplerate_get(&samplerate)));
+  eo_do(in, samplerate = ecore_audio_obj_in_samplerate_get());
   fail_if(samplerate != 1234);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_channels_get(&channels)));
+  eo_do(in, channels = ecore_audio_obj_in_channels_get());
   fail_if(channels != 0);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_channels_set(2)));
+  eo_do(in, ecore_audio_obj_in_channels_set(2));
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_channels_get(&channels)));
+  eo_do(in, channels = ecore_audio_obj_in_channels_get());
   fail_if(channels != 2);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_looped_get(&looped)));
+  eo_do(in, looped = ecore_audio_obj_in_looped_get());
   fail_if(looped);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_looped_set(EINA_TRUE)));
+  eo_do(in, ecore_audio_obj_in_looped_set(EINA_TRUE));
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_looped_get(&looped)));
+  eo_do(in, looped = ecore_audio_obj_in_looped_get());
   fail_if(!looped);
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_length_get(&length)));
+  eo_do(in, length = ecore_audio_obj_in_length_get());
   fail_if(length != 0);
 
-  fail_if(eo_do(in, ecore_audio_obj_in_length_set(10.0)));
+  eo_do(in, ecore_audio_obj_in_length_set(10.0));
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_remaining_get(&length)));
+  eo_do(in, length = ecore_audio_obj_in_remaining_get());
   fail_if(length != -1);
 
   memset(buf, 0xaa, 10);
-  fail_if(!eo_do(in, ecore_audio_obj_in_read(buf, 10, &read)));
+  eo_do(in, read = ecore_audio_obj_in_read(buf, 10));
   fail_if(read != 0);
 
   for (i=0; i<10; i++) {
       fail_if(buf[i] != 0xaa);
   }
 
-  fail_if(!eo_do(in, ecore_audio_obj_paused_set(EINA_TRUE)));
+  eo_do(in, ecore_audio_obj_paused_set(EINA_TRUE));
 
-  fail_if(!eo_do(in, ecore_audio_obj_in_read(buf, 10, &read)));
+  eo_do(in, read = ecore_audio_obj_in_read(buf, 10));
   fail_if(read != 10);
 
   for (i=0; i<10; i++) {
@@ -560,29 +560,29 @@ START_TEST(ecore_test_ecore_audio_obj)
 
     fail_if(!obj);
 
-    fail_if(!eo_do(obj, ecore_audio_obj_name_get(&name)));
+    eo_do(obj, name = ecore_audio_obj_name_get());
 
     fail_if(name);
 
-    fail_if(!eo_do(obj, ecore_audio_obj_name_set("In1")));
-    fail_if(!eo_do(obj, ecore_audio_obj_name_get(&name)));
+    eo_do(obj, ecore_audio_obj_name_set("In1"));
+    eo_do(obj, name = ecore_audio_obj_name_get());
 
     ck_assert_str_eq(name, "In1");
 
-    fail_if(!eo_do(obj, ecore_audio_obj_name_get(NULL)));
+    eo_do(obj, ecore_audio_obj_name_get());
 
-    fail_if(!eo_do(obj, ecore_audio_obj_paused_get(&paused)));
+    eo_do(obj, paused = ecore_audio_obj_paused_get());
     fail_if(paused);
 
-    fail_if(!eo_do(obj, ecore_audio_obj_paused_set(EINA_TRUE)));
-    fail_if(!eo_do(obj, ecore_audio_obj_paused_get(&paused)));
+    eo_do(obj, ecore_audio_obj_paused_set(EINA_TRUE));
+    eo_do(obj, paused = ecore_audio_obj_paused_get());
     fail_if(!paused);
 
-    fail_if(!eo_do(obj, ecore_audio_obj_volume_get(&volume)));
+    eo_do(obj, volume = ecore_audio_obj_volume_get());
     fail_if(volume != 1.0);
 
-    fail_if(!eo_do(obj, ecore_audio_obj_volume_set(0.5)));
-    fail_if(!eo_do(obj, ecore_audio_obj_volume_get(&volume)));
+    eo_do(obj, ecore_audio_obj_volume_set(0.5));
+    eo_do(obj, volume = ecore_audio_obj_volume_get());
     fail_if(volume != 0.5);
 
     eo_del(obj);
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index cf2bd1bb36..6547218a53 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -614,7 +614,6 @@ START_TEST(eo_magic_checks)
         fail_if(eo_class_name_get((Eo_Class*) buf));
         fail_if(eo_class_get(obj) != SIMPLE_CLASS);
         fail_if(eo_class_get(SIMPLE_CLASS) != EO_CLASS_CLASS);
-        eo_class_funcs_set((Eo_Class *) buf, NULL);
         eo_do((Eo_Class *) buf,(void) NULL);
         eo_do_super((Eo_Class *) buf, SIMPLE_CLASS, simple_a_set(++i));
         eo_do_super(SIMPLE_CLASS, (Eo_Class *) buf, simple_a_set(++i));
@@ -659,7 +658,7 @@ START_TEST(eo_magic_checks)
 
         obj2 = NULL;
         eo_do(obj, eo_parent_set((Eo *) buf));
-        eo_do(obj, eo_parent_get(&obj2));
+        eo_do(obj, obj2 = eo_parent_get());
         fail_if(obj2 && (obj2 == (Eo *) buf));
 
         eo_unref(obj);