Modified tests to accomodate changes in adresses etc