Fixes in Acceptance tests