[PRD-3281 & PRD-3833] - fix for URL generators and tooltip generators - ...

...refactor code, remove test catch block - will add test cases as separate pull