Fix make_suite wrapper