Refactor tests - try and use a standard scenario
Update test to use standard scenario