fixing more test imports