Fix imports and test