Add tests to cover new cases