Add missing output for GHCi test
Old switch names and use redesigned classes
Update tests for class parameter tweaks