Contextual switch types are supported
Adding a DateRange switch and Shouldly
a bit of cleanup