fix imports and update tests