bug fix1
bug fix1
Edge case tests