Refactor tests - try and use a standard scenario