Better bundle version URL schema
Update tests