Fix tests and run it before the push url updater