Fix acceptance tests

Fixes #2166
Update to master release

Fixes #2166
More fixes

Fixes #2166