Added original thesis "switch" test.