Code cleanup in the TestbedAddressTest