WIP Prompt estimation test; some tidying