Fix acceptance test, take 2.