No file engine and some code polishing

Please verify it does not break ssuks and the update to ut_ssuurlresolvertest is valid.