Improve acceptance tests