Fixed User tests, fixed prompt editing