Increase tests coverage