Moved a bunch of things and implemented multi-test-selection