Fix acceptance tests

For both Python2 & Python3