Added parameter to setup method to set guid