Fix import and test issue