added more test cases for switch case statements

fixed optional default case handling