modify to include info for click and waitandtest