Clean up testcase a bit. Simplify case blocks and adjust switch instruction to not take an undefined value as input.

llvm-svn: 86997