rename a test
add display: box support
Merge remote-tracking branch 'upstream/master' into inline