Support Request Generation: fixing tests