Improve the acceptance tests