first fixes of Unit tests