Added check for create volume, added better locators for button clicks.