Fix broken test imports caused by previous commit