Fix broken integration tests.
Fix broken integration tests.

irvind/hyper,masaori335/hyper,fredthomsen/hyper,Lukasa/hyper,jdecuyper/hyper,lawnmowerlatte/hyper,Lukasa/hyper,plucury/hyper,fredthomsen/hyper,plucury/hyper,masaori335/hyper,irvind/hyper,lawnmowerlatte/hyper,jdecuyper/hyper