Found another bad import

Plus some test cleanup. Some.