Fix for failing execution tests