Further test updates due to escaping change