Fix/enforce braces non expression statement

As I promised here some more test cases which would fail. With this fix they won't fail anymore.
I use test for BlockStatement again, see my commit message.