Tweaking tests, removing local import.