Adds some additional border-based tests