Add edge cases for tests