Update the (old) unit tests.  Still need one for the new interface
Add a draft of a set implementation for the new scheduler