add in scheduling
changing tests
fixing scheduling