Updated switch test cases, fixed some lingering issues