Add non-border support
Remove test