ticket:3 for #3 fixed tests as per reviewer comment