Test coverage increase

up to 85 %