Restore baseline before today's commits...

... This commit disables the new test code. In theory this version should be stable as nothing in the core address routines _should_ have been changed by my commits today. The test code is however still broken due to some bug in the token binding logic.