Fixed failing tests.
Merge origin/master
Added tests for new switch syntax and fixed bug in switch.