o Improve tests coverage.