Resolved testing bugs