WIP distractor hints skipped when empty, fix tests