Improvement of accept tests