Added black/white tests back, lowered expectations for other test quality