Tweaked to bring in line with hardware testing.