[#1403] Fix tests
[#1403] Move logic in PlayDefaultUpstreamHandler