Testing Dns fixes

Not to be merged