added tests for new edge cases