Update and impreove url generator tests