Fix expected exceptions