solve testing bugs