[Olena-patches] milena r1209: Move tests for border in tests