Simplify extra BR test, fix related parser tests
Simplify extra BR test, fix related parser tests

GabiGrin/trix,GabiGrin/trix,basecamp/trix,basecamp/trix,ChenMichael/trix,ChenMichael/trix,urossmolnik/trix,urossmolnik/trix,basecamp/trix,ChenMichael/trix,urossmolnik/trix,GabiGrin/trix,basecamp/trix