modified to seperate callback url from test id

Change-Id: Icc3b8eb6fe1b39d38adfb980b2fcf4830cac79aa
Merge "modified to seperate callback url from test id"