* Improve code coverage