changed the test system, new addresses, little buxfixes