Fix a test, skip another and a bunch of import cleanups.