Moved some definitions around, moved test code to drscheme-driver.scm