diff --git a/tests/suites/test_suite_md.function b/tests/suites/test_suite_md.function
index 82f82b1..486eacd 100644
--- a/tests/suites/test_suite_md.function
+++ b/tests/suites/test_suite_md.function
@@ -85,8 +85,9 @@
     strncpy( (char *) md_name, {text_md_name}, 100 );
     md_info = md_info_from_string(md_name);
     TEST_ASSERT( md_info != NULL );
+    TEST_ASSERT ( 0 == md_init_ctx( &ctx, md_info ) );
 
-    TEST_ASSERT ( 0 == md_starts( md_info, &ctx ) );
+    TEST_ASSERT ( 0 == md_starts( &ctx ) );
     TEST_ASSERT ( ctx.md_ctx != NULL );
     TEST_ASSERT ( 0 == md_update( &ctx, src_str, strlen( (char *) src_str ) ) );
     TEST_ASSERT ( 0 == md_finish( &ctx, output ) );
@@ -117,10 +118,11 @@
     strncpy( (char *) md_name, {text_md_name}, 100 );
     md_info = md_info_from_string(md_name);
     TEST_ASSERT( md_info != NULL );
+    TEST_ASSERT ( 0 == md_init_ctx( &ctx, md_info ) );
 
     src_len = unhexify( src_str, {hex_src_string} );
     
-    TEST_ASSERT ( 0 == md_starts( md_info, &ctx ) );
+    TEST_ASSERT ( 0 == md_starts( &ctx ) );
     TEST_ASSERT ( ctx.md_ctx != NULL );
     TEST_ASSERT ( 0 == md_update( &ctx, src_str, src_len ) );
     TEST_ASSERT ( 0 == md_finish( &ctx, output ) );
@@ -184,11 +186,12 @@
     strncpy( (char *) md_name, {text_md_name}, 100 );
     md_info = md_info_from_string( md_name );
     TEST_ASSERT( md_info != NULL );
+    TEST_ASSERT ( 0 == md_init_ctx( &ctx, md_info ) );
 
     key_len = unhexify( key_str, {hex_key_string} );
     src_len = unhexify( src_str, {hex_src_string} );
 
-    TEST_ASSERT ( 0 == md_hmac_starts( md_info, &ctx, key_str, key_len ) );
+    TEST_ASSERT ( 0 == md_hmac_starts( &ctx, key_str, key_len ) );
     TEST_ASSERT ( ctx.md_ctx != NULL );
     TEST_ASSERT ( 0 == md_hmac_update( &ctx, src_str, src_len ) );
     TEST_ASSERT ( 0 == md_hmac_finish( &ctx, output ) );