Updated merged 6.8 test to work with 7.0

Change-Id: I5e44183af9431ba34fb0ecaa353e6b65c2aaeace