changed some borders
added some tests