tests simplification; error evaluation fixed