Jaya|Fixed add role tests, merged the 2 steps