Rename tests to have shorter names where the container class provides context.
Add border.