Improve tests coverage to 99%