Minor: cleanup
Add switch test