Move around imports and turn a bunch of tests back on.