Better test coverage (> 90%)