Fix import warning
Fix last failing test on 2.6