[Upg] new unit tests with mockery
[Fix] redirection where attempted url is null
[Upg] merge json