[enh] test pass, moving in imports