fixing bugs testing