Unit tests to improve code coverage