Fixed a few failing acceptance tests