Styling surface interval, adding some tests