Fix testing: first stab
Merge branch 'master' of github.com:skynetservices/skydns2
Fix test framework