modify my dns bundle and unit-test code architecture