Mofified for the ha_test env
more changes