Borders
Fixed problem with borders
Proper tests