Fix acceptance tests and tasks...