Increased tests coverage.