Fix acceptance tests to work w/ split
11300