improve tests coverage
improve tests