Added tests for edge cases