More reorganization
More reorganization

Move scheduler code out of test
Move variable generation code out of test
Add test of variable -> object mapping
(test code is still very messy)

jennselby/corvus,jennselby/corvus