Updated encounter test