Better zyre tester and header cleanup