Set-up a standard scenario for testing etc
Update test to use standard scenario