Add tests to improve coverage