Made fixes for public and private HPP Pay Upon Arrival reservation tests