bug fix+test fies