Move test imports from normal imports