#673 - clean up timeslot usage, add better support for non-Spring testing