Fixed testing bugs...