More updates on fixing smoke tests