John Gu Fix test imports