[Olena-patches] milena r1571: Add full tests for border