Improved acceptance tests