Fix test imports too