Added street_address and street_number to Test base