Fixes Acceptance tests