Add tests to improve code coverage