split out prompts, and fix tests