Updated some tests. Added new test scenario for multiple statements in s...

...witch-case