Add more edge cases to the unit tests
Add more edge cases to the unit tests