Add unit tests to handle this case