add more switch tests
Merge pull request #2293 from WalterBright/add-testswitch

add more switch tests