Adding more test cases for exotic scenarios