Expanded switch test to push it to 100% coverage