More unit tests to improve code coverage