TODO - remove borders + tests

refs #HOT-13