[#2164] Adding edge cases in tests