Make test more compact
Shiny syntax
Fix merge conflict