acceptance tests and revision of some errors