made a few more basic tests, all passing, added some more functionality to scheduler class