Testify 240

This closes #240 by simplifying and making-better the scheduling algorithm.