Fixes for certification tests